From: Marcin Cieslak <saper@saper.info>
Date: Wed, 15 Aug 2012 17:46:01 +0000 (+0200)
Subject: FreeBSD does not need extern char *sys_errlist[]
X-Git-Tag: 2.2.0b~81^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a35975a334e5d6b03103b1ccb47791a1a6b3a69f;p=oweals%2Fcde.git

FreeBSD does not need extern char *sys_errlist[]

Add preprocessor directives not to try
to redefine sys_errlist[] or sys_nerr

There are already definitions:

 extern __const char *__const sys_errlist[];
 extern __const int sys_nerr;

in <stdio.h>

Actually we should have something like
NeedSysErrlist in imake definitions
to get rid of those #ifdefs.
---

diff --git a/cde/programs/dtappbuilder/src/ab/palette_stubs.c b/cde/programs/dtappbuilder/src/ab/palette_stubs.c
index 8f8dd864..da9e97a4 100644
--- a/cde/programs/dtappbuilder/src/ab/palette_stubs.c
+++ b/cde/programs/dtappbuilder/src/ab/palette_stubs.c
@@ -140,7 +140,7 @@ static void 	register_palette_info(
 **                                                                      **
 **************************************************************************/
 
-#if !defined(linux)
+#if !defined(linux) && !defined(__FreeBSD__)
 extern char     *sys_errlist[];
 #endif
 
diff --git a/cde/programs/dtappbuilder/src/ab/proj.c b/cde/programs/dtappbuilder/src/ab/proj.c
index a2cb1fc5..d2bfa97c 100644
--- a/cde/programs/dtappbuilder/src/ab/proj.c
+++ b/cde/programs/dtappbuilder/src/ab/proj.c
@@ -228,7 +228,7 @@ static XtTranslations proj_transtbl = NULL;
 static XRectangle       *rband_rect = NULL;
 static Boolean          mselect_adjust = False;
 
-#if !defined(linux)
+#if !defined(linux) && !defined(__FreeBSD__)
 extern char             *sys_errlist[];
 #endif
 char			Buf[MAXPATHLEN];	/* Work buffer */
diff --git a/cde/programs/dtappbuilder/src/ab/projP_utils.c b/cde/programs/dtappbuilder/src/ab/projP_utils.c
index e44764bd..d0e69008 100644
--- a/cde/programs/dtappbuilder/src/ab/projP_utils.c
+++ b/cde/programs/dtappbuilder/src/ab/projP_utils.c
@@ -93,7 +93,7 @@ static void     mult_module_selected(
 **                                                                      **
 **************************************************************************/
 
-#if !defined(linux)
+#if !defined(linux) && !defined(__FreeBSD__)
 extern char	*sys_errlist[];
 #endif
 char		Buf[MAXPATHLEN];	/* Work buffer */
diff --git a/cde/programs/dtappbuilder/src/ab/proj_utils.c b/cde/programs/dtappbuilder/src/ab/proj_utils.c
index 0256c0f0..6754a1a6 100644
--- a/cde/programs/dtappbuilder/src/ab/proj_utils.c
+++ b/cde/programs/dtappbuilder/src/ab/proj_utils.c
@@ -180,7 +180,7 @@ static void	notify_proj_save_as_okCB(
 **                                                                      **
 **************************************************************************/
 
-#if !defined(linux)
+#if !defined(linux) && !defined(__FreeBSD__)
 extern char             *sys_errlist[];
 #endif
 
diff --git a/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c b/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c
index 08a876a4..def0f7ff 100644
--- a/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c
+++ b/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c
@@ -61,7 +61,7 @@
 
 BIL_LOAD_INFO	bilP_load;
 char		Buf[MAXPATHLEN];
-#if !defined(linux)
+#if !defined(linux) && !defined(__FreeBSD__)
 extern char     *sys_errlist[];
 #endif
 
diff --git a/cde/programs/dtcm/dtcm/dnd.c b/cde/programs/dtcm/dtcm/dnd.c
index d4c6be61..eb5fb8a2 100644
--- a/cde/programs/dtcm/dtcm/dnd.c
+++ b/cde/programs/dtcm/dtcm/dnd.c
@@ -72,7 +72,7 @@
 
 static Bool lookForButton(Display *, XEvent *, XPointer);
 
-#if !defined(linux)
+#if !defined(linux) && !defined(__FreeBSD__)
 extern char	*sys_errlist[];
 #endif
 
diff --git a/cde/programs/dtimsstart/remote.c b/cde/programs/dtimsstart/remote.c
index 819a265f..476c7d00 100644
--- a/cde/programs/dtimsstart/remote.c
+++ b/cde/programs/dtimsstart/remote.c
@@ -37,7 +37,7 @@
 #include	<X11/Xproto.h>		/* for X_ChangeHosts */
 #include	<X11/Xatom.h>		/* for XA_STRING */
 
-#if !defined(linux)
+#if !defined(linux) && !defined(__FreeBSD__)
 extern char	*sys_errlist[];
 #endif
 
diff --git a/cde/programs/dtimsstart/start.c b/cde/programs/dtimsstart/start.c
index 68800512..085403a0 100644
--- a/cde/programs/dtimsstart/start.c
+++ b/cde/programs/dtimsstart/start.c
@@ -32,7 +32,7 @@
 #define _NFILE FOPEN_MAX
 #endif
 
-#if !defined(linux)
+#if !defined(linux) && !defined(__FreeBSD__)
 extern char	*sys_errlist[];
 extern int	sys_nerr;
 #endif
diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c b/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c
index 615ee9ca..e6fd10b2 100644
--- a/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c
+++ b/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c
@@ -105,7 +105,7 @@ SysErrorMsg(
    int n
    )
 {
-#if !defined(linux)
+#if !defined(linux) && !defined(__FreeBSD__)
     extern char *sys_errlist[];
     extern int sys_nerr;
 #endif