diff --git a/mozilla/config/Makefile.in b/mozilla/config/Makefile.in index 9c907198c14..878c1bb6c9e 100644 --- a/mozilla/config/Makefile.in +++ b/mozilla/config/Makefile.in @@ -30,6 +30,9 @@ CSRCS = nsinstall.c pathsub.c PLSRCS = nfspwd.pl revdepth.pl TARGETS = $(PROGRAM) $(PLSRCS:.pl=) +ifeq ($(OS_ARCH), Linux) +DEFINES += -D_BSD_SOURCE +endif # Generate the build number on the fly. ifneq ($(origin BUILD_OFFICIAL)_$(origin MOZILLA_OFFICIAL),undefined_undefined) diff --git a/mozilla/config/nsinstall.c b/mozilla/config/nsinstall.c index 848bd80371c..18a70f33f53 100644 --- a/mozilla/config/nsinstall.c +++ b/mozilla/config/nsinstall.c @@ -43,7 +43,7 @@ #include #include "pathsub.h" -#ifdef NEED_GETOPT_H +#ifdef HAVE_GETOPT_H #include #endif diff --git a/mozilla/configure.in b/mozilla/configure.in index 10abe731c39..ec185324440 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -620,6 +620,7 @@ case "$target" in ;; *-*linux*) + AC_DEFINE(_POSIX_SOURCE) TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"' case "${host_cpu}" in @@ -1527,7 +1528,7 @@ fi dnl Checks for header files. dnl ======================================================== -AC_CHECK_HEADERS(sys/byteorder.h compat.h) +AC_CHECK_HEADERS(sys/byteorder.h compat.h getopt.h) AC_CHECK_HEADERS(sys/bittypes.h memory.h unistd.h sys/filio.h) AC_CHECK_HEADERS(sys/ipc.h shm.h sys/shm.h X11/extensions/XShm.h) diff --git a/mozilla/dbm/src/Makefile.in b/mozilla/dbm/src/Makefile.in index 37cf3907e7c..64f72ff638a 100644 --- a/mozilla/dbm/src/Makefile.in +++ b/mozilla/dbm/src/Makefile.in @@ -50,6 +50,9 @@ override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG) +ifeq ($(OS_ARCH), Linux) +DEFINES += -D_BSD_SOURCE +endif ifeq ($(OS_ARCH),AIX) OS_LIBS += -lc_r diff --git a/mozilla/dbm/tests/Makefile.in b/mozilla/dbm/tests/Makefile.in index 2c505fd45bc..0a58936f000 100644 --- a/mozilla/dbm/tests/Makefile.in +++ b/mozilla/dbm/tests/Makefile.in @@ -31,3 +31,6 @@ LIBS = -lmozdbm_s include $(topsrcdir)/config/rules.mk +ifeq ($(OS_ARCH), Linux) +DEFINES += -D_BSD_SOURCE +endif diff --git a/mozilla/gfx/src/gtk/Makefile.in b/mozilla/gfx/src/gtk/Makefile.in index d555f5dd92e..1b7bafe7d96 100644 --- a/mozilla/gfx/src/gtk/Makefile.in +++ b/mozilla/gfx/src/gtk/Makefile.in @@ -55,6 +55,9 @@ CFLAGS += $(TK_CFLAGS) endif DEFINES += -D_IMPL_NS_GFXNONXP +ifeq ($(OS_ARCH), Linux) +DEFINES += -D_BSD_SOURCE +endif INCLUDES += \ -I$(srcdir)/. \ diff --git a/mozilla/gfx/src/ps/Makefile.in b/mozilla/gfx/src/ps/Makefile.in index 07717f0b6fb..6f662064739 100644 --- a/mozilla/gfx/src/ps/Makefile.in +++ b/mozilla/gfx/src/ps/Makefile.in @@ -57,6 +57,9 @@ EXTRA_DSO_LDOPTS = \ include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_GFXONXP +ifeq ($(OS_ARCH), Linux) +DEFINES += -D_BSD_SOURCE +endif CFLAGS += $(TK_CFLAGS) CXXFLAGS += $(TK_CFLAGS) diff --git a/mozilla/js/src/xpconnect/shell/Makefile.in b/mozilla/js/src/xpconnect/shell/Makefile.in index 1763dcc1ee8..e513172dd3e 100644 --- a/mozilla/js/src/xpconnect/shell/Makefile.in +++ b/mozilla/js/src/xpconnect/shell/Makefile.in @@ -36,4 +36,7 @@ LIBS = \ include $(topsrcdir)/config/rules.mk DEFINES += -DJS_THREADSAFE +ifeq ($(OS_ARCH), Linux) +DEFINES += -D_BSD_SOURCE +endif diff --git a/mozilla/mailnews/mime/src/Makefile.in b/mozilla/mailnews/mime/src/Makefile.in index 4b240b0e0a3..cc8ba5bd1b5 100644 --- a/mozilla/mailnews/mime/src/Makefile.in +++ b/mozilla/mailnews/mime/src/Makefile.in @@ -104,3 +104,6 @@ EXTRA_DSO_LDOPTS = \ include $(topsrcdir)/config/rules.mk +ifeq ($(OS_ARCH), Linux) +DEFINES += -D_BSD_SOURCE +endif diff --git a/mozilla/modules/libimg/src/Makefile.in b/mozilla/modules/libimg/src/Makefile.in index 9429ebbd132..9f0ac0a83f1 100644 --- a/mozilla/modules/libimg/src/Makefile.in +++ b/mozilla/modules/libimg/src/Makefile.in @@ -54,3 +54,6 @@ override NO_SHARED_LIB=1 override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk +ifeq ($(OS_ARCH), Linux) +DEFINES += -D_XOPEN_SOURCE=500 +endif diff --git a/mozilla/netwerk/protocol/resource/src/Makefile.in b/mozilla/netwerk/protocol/resource/src/Makefile.in index 2c640668c02..97955a078a4 100644 --- a/mozilla/netwerk/protocol/resource/src/Makefile.in +++ b/mozilla/netwerk/protocol/resource/src/Makefile.in @@ -34,4 +34,6 @@ CPPSRCS = \ $(NULL) include $(topsrcdir)/config/rules.mk - +ifeq ($(OS_ARCH), Linux) +DEFINES += -D_BSD_SOURCE +endif diff --git a/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in b/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in index a6cb4285a2e..bc559571587 100644 --- a/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in +++ b/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in @@ -35,6 +35,9 @@ override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/../.. +ifeq ($(OS_ARCH), Linux) +DEFINES += -D_XOPEN_SOURCE=500 +endif ifndef MOZ_MONOLITHIC_TOOLKIT CXXFLAGS += $(MOZ_GTK_CFLAGS) diff --git a/mozilla/widget/src/gtk/Makefile.in b/mozilla/widget/src/gtk/Makefile.in index 777d1c4d03e..9e9c432612f 100644 --- a/mozilla/widget/src/gtk/Makefile.in +++ b/mozilla/widget/src/gtk/Makefile.in @@ -82,6 +82,9 @@ CXXFLAGS += $(TK_CFLAGS) endif DEFINES += -D_IMPL_NS_WIDGET -DUSE_XIM +ifeq ($(OS_ARCH), Linux) +DEFINES += -D_BSD_SOURCE +endif INCLUDES += \ -I$(srcdir)/../xpwidgets \ diff --git a/mozilla/xpcom/base/Makefile.in b/mozilla/xpcom/base/Makefile.in index 17e4ee7c6d3..403c395958f 100644 --- a/mozilla/xpcom/base/Makefile.in +++ b/mozilla/xpcom/base/Makefile.in @@ -65,6 +65,9 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) DEFINES += -D_IMPL_NS_COM +ifeq ($(OS_ARCH), Linux) +DEFINES += -D_BSD_SOURCE +endif REQUIRES = xpcom MKSHLIB := diff --git a/mozilla/xpcom/io/Makefile.in b/mozilla/xpcom/io/Makefile.in index 2987e349b0e..08075c7fa8b 100644 --- a/mozilla/xpcom/io/Makefile.in +++ b/mozilla/xpcom/io/Makefile.in @@ -70,6 +70,10 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE +ifeq ($(OS_ARCH), Linux) +DEFINES += -D_BSD_SOURCE +endif + REQUIRES = xpcom uconv unicharutil MKSHLIB :=