get rid of all the platform ifdefs around sys_errlist. replace them all with #ifdef HAVE_SYSERRLIST, which is defined in the config/*.mk's and which should be tested for by configure.in
git-svn-id: svn://10.0.0.236/trunk@8448 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
2040ea16b7
commit
161a7ca9f5
@ -278,7 +278,7 @@ fe_Alert_2 (Widget parent, const char *message)
|
||||
(void) fe_dialog (parent, "error", message, FALSE, 0, FALSE, FALSE, 0);
|
||||
}
|
||||
|
||||
#if !defined(__FreeBSD__) && !defined(MKLINUX) && !defined(LINUX_GLIBC_2)
|
||||
#if !defined(HAVE_SYSERRLIST)
|
||||
#include <sys/errno.h>
|
||||
extern char *sys_errlist[];
|
||||
extern int sys_nerr;
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
#include "xfe.h"
|
||||
|
||||
#include <sys/errno.h>
|
||||
#if !defined(__FreeBSD__) && !defined(LINUX_GLIBC_2)
|
||||
#if !defined(HAVE_SYSERRLIST)
|
||||
extern char *sys_errlist[];
|
||||
extern int sys_nerr;
|
||||
#endif
|
||||
|
||||
@ -1920,6 +1920,8 @@ build_user_agent_string(char *versionLocale)
|
||||
strcat (buf, "IRIX");
|
||||
#elif defined(__FreeBSD__)
|
||||
strcat (buf, "FreeBSD");
|
||||
#elif defined(__NetBSD__)
|
||||
strcat (buf, "NetBSD");
|
||||
#elif defined(__386BSD__)
|
||||
strcat (buf, "BSD/386");
|
||||
#elif defined(__osf__)
|
||||
@ -3580,7 +3582,7 @@ fe_rename_init_files (Widget toplevel)
|
||||
|
||||
#else /* !OLD_UNIX_FILES */
|
||||
|
||||
#if !defined(__FreeBSD__) && !defined(MKLINUX) && !defined(LINUX_GLIBC_2)
|
||||
#if !defined(HAVE_SYSERRLIST)
|
||||
extern char *sys_errlist[];
|
||||
extern int sys_nerr;
|
||||
#endif
|
||||
@ -5327,4 +5329,3 @@ XP_Bool fe_enable_fullcircle(void)
|
||||
return fullcircle_enable;
|
||||
}
|
||||
#endif /* MOZ_FULLCIRCLE */
|
||||
|
||||
|
||||
@ -40,6 +40,7 @@ extern int putenv (const char *);
|
||||
|
||||
#if defined(LINUX) && defined(__GLIBC__) && (__GLIBC__ >= 2)
|
||||
#define LINUX_GLIBC_2
|
||||
#define HAVE_SYSERRLIST
|
||||
#endif
|
||||
|
||||
#endif /* __xfe_mozilla_h_ */
|
||||
|
||||
@ -76,7 +76,6 @@ extern int XFE_HELPERS_PLUGIN_DESC_CHANGE;
|
||||
#define ALT "alt"
|
||||
#define SPACE " "
|
||||
|
||||
/* For sys_errlist and sys_nerr */
|
||||
#include "prprf.h"
|
||||
#include "libi18n.h"
|
||||
#include "fonts.h"
|
||||
|
||||
@ -76,7 +76,7 @@
|
||||
|
||||
/* For sys_errlist and sys_nerr */
|
||||
#include <sys/errno.h>
|
||||
#if !defined(__FreeBSD__) && !defined(LINUX_GLIBC_2)
|
||||
#if !defined(HAVE_SYSERRLIST)
|
||||
extern char *sys_errlist[];
|
||||
extern int sys_nerr;
|
||||
#endif
|
||||
|
||||
@ -37,7 +37,7 @@ OS_LIBS =
|
||||
# Don't define BSD, because it's already defined in /usr/include/sys/param.h.
|
||||
PLATFORM_FLAGS = -DFREEBSD -DBSDI -DBSDI_2 -D__386BSD__ -Di386 $(DSO_CFLAGS)
|
||||
MOVEMAIL_FLAGS = -DHAVE_STRERROR
|
||||
PORT_FLAGS = -DSW_THREADS -DNEED_UINT -DHAVE_LCHOWN -DNTOHL_ENDIAN_H -DHAVE_FILIO_H -DNEED_SYS_TIME_H -DNEED_UINT_T -DHAVE_BSD_FLOCK
|
||||
PORT_FLAGS = -DSW_THREADS -DNEED_UINT -DHAVE_LCHOWN -DNTOHL_ENDIAN_H -DHAVE_FILIO_H -DNEED_SYS_TIME_H -DNEED_UINT_T -DHAVE_BSD_FLOCK -DHAVE_SYSERRLIST
|
||||
PDJAVA_FLAGS = -mx128m
|
||||
OS_GPROF_FLAGS = -pg
|
||||
LD_FLAGS = -L/usr/X11R6/lib -lXm
|
||||
|
||||
@ -82,6 +82,7 @@ PORT_FLAGS += -DNEED_TIME_R -DMITSHM -D_XOPEN_SOURCE
|
||||
endif
|
||||
ifeq ($(CPU_ARCH),ppc)
|
||||
PLATFORM_FLAGS += -DMKLINUX -D$(CPU_ARCH)
|
||||
PORT_FLAGS += -DHAVE_SYSERRLIST
|
||||
endif
|
||||
ifeq ($(CPU_ARCH),sparc)
|
||||
PLATFORM_FLAGS += -D$(CPU_ARCH)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user