bug 886526 - remove XPCOM_TRANSLATE_NSGM_ENTRY_POINT r=bsmedberg

config/config.mk

@@ -239,9 +239,7 @@ _ENABLE_PIC=1
 
 ifdef LIBXUL_LIBRARY
 ifdef IS_COMPONENT
-ifdef MODULE_NAME
-DEFINES += -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1
-else
+ifndef MODULE_NAME
 $(error Component makefile does not specify MODULE_NAME.)
 endif
 endif

js/src/config/config.mk

@@ -239,9 +239,7 @@ _ENABLE_PIC=1
 
 ifdef LIBXUL_LIBRARY
 ifdef IS_COMPONENT
-ifdef MODULE_NAME
-DEFINES += -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1
-else
+ifndef MODULE_NAME
 $(error Component makefile does not specify MODULE_NAME.)
 endif
 endif

toolkit/library/nsStaticXULComponents.cpp

@@ -3,8 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define XPCOM_TRANSLATE_NSGM_ENTRY_POINT 1
-
 #include "mozilla/Module.h"
 #include "nsXPCOM.h"
 #include "nsStaticComponents.h"

toolkit/xre/nsAppRunner.cpp

@@ -8,8 +8,6 @@
 #include <os2safe.h>
 #endif
 
-#define XPCOM_TRANSLATE_NSGM_ENTRY_POINT 1
-
 #if defined(MOZ_WIDGET_QT)
 #include <QApplication>
 #include <QStringList>

xpcom/components/Module.h

@@ -103,7 +103,7 @@ struct Module
 
 } // namespace
 
-#if defined(XPCOM_TRANSLATE_NSGM_ENTRY_POINT)
+#if defined(MOZILLA_INTERNAL_API)
 #  define NSMODULE_NAME(_name) _name##_NSModule
 #  define NSMODULE_DECL(_name) extern mozilla::Module const *const NSMODULE_NAME(_name)
 #  define NSMODULE_DEFN(_name) NSMODULE_DECL(_name)