On Wed, 15 Aug 2012, Marcin Cieslak wrote:
> 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>
>
This is probably true of all of the BSD's, so instead of (__FreeBSD__)
shouldn't it be (CSRG_BASED)?
---
> Actually we should have something like
> NeedSysErrlist in imake definitions
> to get rid of those #ifdefs.
> ---
> cde/programs/dtappbuilder/src/ab/palette_stubs.c | 2 +-
> cde/programs/dtappbuilder/src/ab/proj.c | 2 +-
> cde/programs/dtappbuilder/src/ab/projP_utils.c | 2 +-
> cde/programs/dtappbuilder/src/ab/proj_utils.c | 2 +-
> .../dtappbuilder/src/libABil/bil_loadfile.c | 2 +-
> cde/programs/dtcm/dtcm/dnd.c | 2 +-
> cde/programs/dtimsstart/remote.c | 2 +-
> cde/programs/dtimsstart/start.c | 2 +-
> cde/programs/dtprintinfo/libUI/MotifUI/Debug.c | 2 +-
> 9 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/cde/programs/dtappbuilder/src/ab/palette_stubs.c
> b/cde/programs/dtappbuilder/src/ab/palette_stubs.c
> index 8f8dd86..da9e97a 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 a2cb1fc..d2bfa97 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 e44764b..d0e6900 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 0256c0f..6754a1a 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 08a876a..def0f7f 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 d4c6be6..eb5fb8a 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 819a265..476c7d0 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 6880051..085403a 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 615ee9c..e6fd10b 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
>
--
Jon Trulson
"If the Martian rope-a-dope don't get him, he'll get himself, he'll
come in too fast and punch himself out."
- one of my brothers, referring to the Curiosity landing.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
