Bug 963860 - fix macro redefinition when compiling TestAUSReadStrings.cpp. r=bbondy
authorRobert Strong <robert.bugzilla@gmail.com>
Mon, 27 Jan 2014 10:35:38 -0800
changeset 181417 4a1cd54502fd83f699ece6d6c983b75eea748b44
parent 181416 e50f0e1b8dcc2c8e6869c0bdf34df7af896f366e
child 181418 d1e8a9c8c9a58719c8a383c5d4e9294a6118cb4e
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbbondy
bugs963860
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 963860 - fix macro redefinition when compiling TestAUSReadStrings.cpp. r=bbondy
toolkit/mozapps/update/tests/TestAUSReadStrings.cpp
--- a/toolkit/mozapps/update/tests/TestAUSReadStrings.cpp
+++ b/toolkit/mozapps/update/tests/TestAUSReadStrings.cpp
@@ -6,26 +6,24 @@
 /**
  * This binary tests the updater's ReadStrings ini parser and should run in a
  * directory with a Unicode character to test bug 473417.
  */
 #ifdef XP_WIN
   #include <windows.h>
   #define NS_main wmain
   #define NS_tstrrchr wcsrchr
-  #define NS_tsnprintf _snwprintf
   #define NS_T(str) L ## str
   #define PATH_SEPARATOR_CHAR L'\\'
   // On Windows, argv[0] can also have forward slashes instead
   #define ALT_PATH_SEPARATOR_CHAR L'/'
 #else
   #include <unistd.h>
   #define NS_main main
   #define NS_tstrrchr strrchr
-  #define NS_tsnprintf snprintf
   #define NS_T(str) str
 #ifdef XP_OS2
   #define PATH_SEPARATOR_CHAR '\\'
 #else
   #define PATH_SEPARATOR_CHAR '/'
 #endif
 #endif