From 65cceb90abe1fc27fb71e3b9dcc6cca8986501d7 Mon Sep 17 00:00:00 2001
From: Walter Meinl <wuno@lsvw.de>
Date: Sat, 6 Mar 2010 12:58:04 -0500
Subject: [PATCH] Bug 550542: [OS/2] Followups for xmalloc r=cjones

---
 configure.in                | 4 ++--
 js/src/configure.in         | 4 ++--
 memory/mozalloc/Makefile.in | 5 +++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index b4f5eed1f2dc..700f35fbf009 100644
--- a/configure.in
+++ b/configure.in
@@ -2539,8 +2539,8 @@ case "$target" in
     MOZ_DEBUG_FLAGS="-g -fno-inline"
     MOZ_OPTIMIZE_FLAGS="-O2"
     MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
-    DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib'
-    LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib'
+    DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
+    LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
     TARGET_MD_ARCH=os2
     _PLATFORM_DEFAULT_TOOLKIT="cairo-os2"
     MOZ_ENABLE_POSTSCRIPT=
diff --git a/js/src/configure.in b/js/src/configure.in
index 947fed6c4227..17fded10717d 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -2215,8 +2215,8 @@ case "$target" in
     MOZ_DEBUG_FLAGS="-g -fno-inline"
     MOZ_OPTIMIZE_FLAGS="-O2"
     MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
-    DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib'
-    LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib'
+    DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
+    LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
     TARGET_MD_ARCH=os2
     _PLATFORM_DEFAULT_TOOLKIT="cairo-os2"
     MOZ_ENABLE_POSTSCRIPT=
diff --git a/memory/mozalloc/Makefile.in b/memory/mozalloc/Makefile.in
index 3f3f910a2b6a..c4b06ce059e8 100644
--- a/memory/mozalloc/Makefile.in
+++ b/memory/mozalloc/Makefile.in
@@ -58,6 +58,11 @@ export NO_SHUNT	= 1
 OS_LIBS		=
 endif
 
+ifeq (,$(filter-out OS2,$(OS_ARCH)))
+# The strndup declaration in string.h is in an ifdef __USE_GNU section
+DEFINES		+= -D_GNU_SOURCE
+endif
+
 EXPORTS_NAMESPACES 	= mozilla
 EXPORTS_mozilla 	= mozalloc.h mozalloc_macro_wrappers.h mozalloc_oom.h