mozilla-central: changeset 248769:18389478f2fcb5a6d11e8a08c5c59546dbc3613e

author	Ted Mielczarek <ted@mielczarek.org>
	Tue, 10 Feb 2015 15:36:37 -0500
changeset 248769	18389478f2fcb5a6d11e8a08c5c59546dbc3613e
parent 248768	21ce33a564ae3e502dfacf80eb43fe57bc4cec0c
child 248770	aeaeecccf41635ba36da9f4d6d8a7fabfa5fd998
push id	28904
push user	philringnalda@gmail.com
push date	Sun, 14 Jun 2015 02:49:28 +0000
treeherder	mozilla-central@c223b8844264 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	froydnj
bugs	1171574
milestone	41.0a1
first release with	nightly linux32 c223b8844264 / 41.0a1 / 20150614030204 / files nightly linux64 c223b8844264 / 41.0a1 / 20150614030204 / files nightly mac c223b8844264 / 41.0a1 / 20150614030204 / files nightly win32 c223b8844264 / 41.0a1 / 20150614030204 / files nightly win64 c223b8844264 / 41.0a1 / 20150614030204 / files
last release without	nightly linux32 b7ee8e13145a / 41.0a1 / 20150613030206 / files nightly linux64 b7ee8e13145a / 41.0a1 / 20150613030206 / files nightly mac b7ee8e13145a / 41.0a1 / 20150613030206 / files nightly win32 b7ee8e13145a / 41.0a1 / 20150613030206 / files nightly win64 b7ee8e13145a / 41.0a1 / 20150613030206 / files

--- a/xpcom/glue/standalone/nsXPCOMGlue.cpp
+++ b/xpcom/glue/standalone/nsXPCOMGlue.cpp
@@ -25,17 +25,17 @@ static bool do_preload = false;
 
 #if defined(XP_WIN)
 #define READ_TEXTMODE L"rt"
 #else
 #define READ_TEXTMODE "r"
 #endif
 
 #if defined(SUNOS4) || defined(NEXTSTEP) || \
-    defined(XP_DARWIN) || \
+    defined(XP_MACOSX) || \
     (defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__)
 #define LEADING_UNDERSCORE "_"
 #else
 #define LEADING_UNDERSCORE
 #endif
 
 #if defined(XP_WIN)
 #include <windows.h>