From ca08c410e54df8474d59b818bc09aaf229553719 Mon Sep 17 00:00:00 2001
From: "seawood%netscape.com" <seawood%netscape.com>
Date: Sun, 11 Aug 2002 05:46:21 +0000
Subject: [PATCH] Remove unused _IMPL_NS_GFXNONXP define. Thanks to Stephen
 Walker <walk84@yahoo.com> for the patch. Bug #162117 r=cls

---
 gfx/src/gtk/Makefile.in     | 1 -
 gfx/src/photon/Makefile.in  | 2 --
 gfx/src/qt/Makefile.in      | 1 -
 gfx/src/windows/Makefile.in | 2 +-
 gfx/src/xlib/Makefile.in    | 2 +-
 xpcom/base/nsComObsolete.h  | 8 --------
 6 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/gfx/src/gtk/Makefile.in b/gfx/src/gtk/Makefile.in
index 249ced4cd56..e4e26becf49 100644
--- a/gfx/src/gtk/Makefile.in
+++ b/gfx/src/gtk/Makefile.in
@@ -144,7 +144,6 @@ ifdef MOZ_ENABLE_XINERAMA
 GFX_XINERAMA_LIBS += $(MOZ_XINERAMA_LIBS)
 endif
 
-DEFINES		+= -D_IMPL_NS_GFXNONXP
 ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_BSD_SOURCE
 endif
diff --git a/gfx/src/photon/Makefile.in b/gfx/src/photon/Makefile.in
index c99652a54f1..9874b7ac112 100644
--- a/gfx/src/photon/Makefile.in
+++ b/gfx/src/photon/Makefile.in
@@ -70,8 +70,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
 		-lgkgfx \
 		$(NULL)
 
-DEFINES		+= -D_IMPL_NS_GFXNONXP
-
 INCLUDES	+= \
 		-I$(srcdir)/. \
 		-I$(srcdir)/.. \
diff --git a/gfx/src/qt/Makefile.in b/gfx/src/qt/Makefile.in
index adea2e2c116..ea0829a20df 100644
--- a/gfx/src/qt/Makefile.in
+++ b/gfx/src/qt/Makefile.in
@@ -77,7 +77,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
                 $(NULL)
 
-DEFINES		+= -D_IMPL_NS_GFXNONXP
 ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_BSD_SOURCE
 endif
diff --git a/gfx/src/windows/Makefile.in b/gfx/src/windows/Makefile.in
index b9eb4d1ef08..041b0045c61 100644
--- a/gfx/src/windows/Makefile.in
+++ b/gfx/src/windows/Makefile.in
@@ -97,7 +97,7 @@ libs:: fontEncoding.properties
 install:: fontEncoding.properties
 	$(INSTALL) $^ $(DESTDIR)$(mozappdir)/res/fonts
 
-DEFINES	+= -D_IMPL_NS_GFXNONXP -DWIN32_LEAN_AND_MEAN -DSTRICT 
+DEFINES	+= -DWIN32_LEAN_AND_MEAN -DSTRICT 
 
 EXTRA_DSO_LDOPTS += \
 		$(EXTRA_DSO_LIBS) \
diff --git a/gfx/src/xlib/Makefile.in b/gfx/src/xlib/Makefile.in
index f6522f694a7..89786fff8cb 100644
--- a/gfx/src/xlib/Makefile.in
+++ b/gfx/src/xlib/Makefile.in
@@ -112,7 +112,7 @@ EXTRA_DSO_LDOPTS += \
 		$(GFX_XIE_LIBS) \
 		$(NULL)
 
-DEFINES		+= -D_IMPL_NS_GFXNONXP -DUSE_MOZILLA_TYPES
+DEFINES		+= -DUSE_MOZILLA_TYPES
 
 ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_BSD_SOURCE
diff --git a/xpcom/base/nsComObsolete.h b/xpcom/base/nsComObsolete.h
index 37b5b5cc55c..d02f16aa17f 100644
--- a/xpcom/base/nsComObsolete.h
+++ b/xpcom/base/nsComObsolete.h
@@ -43,14 +43,6 @@
 #define NS_WIDGET NS_IMPORT
 #endif
 
-#ifdef _IMPL_NS_GFXNONXP
-#define NS_GFXNONXP NS_EXPORT
-#define NS_GFXNONXP_(type) NS_EXPORT_(type)
-#else
-#define NS_GFXNONXP NS_IMPORT
-#define NS_GFXNONXP_(type) NS_IMPORT_(type)
-#endif
-
 #ifdef _IMPL_NS_GFX
 #define NS_GFX NS_EXPORT
 #define NS_GFX_(type) NS_EXPORT_(type)