From: Jelle Hermsen Date: Sat, 29 Sep 2012 11:14:57 +0000 (+0200) Subject: Changed a couple of ifdefs for __FreeBSD__ to CSRG_BASED. These are all clearcut... X-Git-Tag: 2.2.0c~2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b8862cab32e236fd7c6fdccf057acce63e30af12;p=oweals%2Fcde.git Changed a couple of ifdefs for __FreeBSD__ to CSRG_BASED. These are all clearcut cases. I left the ones I had doubts about, or where I wasn't sure about the OpenBSD side of things to look at later. --- diff --git a/cde/lib/DtSearch/raima/vista.h b/cde/lib/DtSearch/raima/vista.h index 704e9955..ba0c2733 100644 --- a/cde/lib/DtSearch/raima/vista.h +++ b/cde/lib/DtSearch/raima/vista.h @@ -86,7 +86,7 @@ # define __SVR4_I386_ABI_L1__ #endif #include /* pickup WORD_BIT, LONG_BIT */ -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(CSRG_BASED) # undef __SVR4_I386_ABI_L1__ # ifndef WORD_BIT # define WORD_BIT 32 diff --git a/cde/lib/tt/bin/dbck/options.C b/cde/lib/tt/bin/dbck/options.C index a0ef6bc9..bebfc4fa 100644 --- a/cde/lib/tt/bin/dbck/options.C +++ b/cde/lib/tt/bin/dbck/options.C @@ -37,7 +37,7 @@ #include #include #include "util/copyright.h" -#if defined(linux) || defined(sgi) || defined(__FreeBSD__) +#if defined(linux) || defined(sgi) || defined(CSRG_BASED) #include #endif #include "dbck.h" diff --git a/cde/lib/tt/bin/tt_type_comp/mp_type_comp.C b/cde/lib/tt/bin/tt_type_comp/mp_type_comp.C index 3737fa1b..267ec6f1 100644 --- a/cde/lib/tt/bin/tt_type_comp/mp_type_comp.C +++ b/cde/lib/tt/bin/tt_type_comp/mp_type_comp.C @@ -42,7 +42,7 @@ #if defined(linux) #include #endif -#if defined(sgi) || defined(__FreeBSD__) +#if defined(sgi) || defined(CSRG_BASED) #include #endif #if defined(USL) || defined(__uxp__) diff --git a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C index c2560821..bc48e6e5 100644 --- a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C +++ b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C @@ -63,7 +63,7 @@ #include #include -#if defined(sgi) || defined(__FreeBSD__) +#if defined(sgi) || defined(CSRG_BASED) #include #endif diff --git a/cde/lib/tt/bin/ttsession/mp_server.C b/cde/lib/tt/bin/ttsession/mp_server.C index 1afa0576..18b58a86 100644 --- a/cde/lib/tt/bin/ttsession/mp_server.C +++ b/cde/lib/tt/bin/ttsession/mp_server.C @@ -53,7 +53,7 @@ #include #include -#if defined(sgi) || defined(__FreeBSD__) +#if defined(sgi) || defined(CSRG_BASED) #include #endif diff --git a/cde/programs/dtappbuilder/src/ab/palette_stubs.c b/cde/programs/dtappbuilder/src/ab/palette_stubs.c index da9e97a4..5cd12c2c 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) && !defined(__FreeBSD__) +#if !defined(linux) && !defined(CSRG_BASED) extern char *sys_errlist[]; #endif diff --git a/cde/programs/dtappbuilder/src/ab/proj.c b/cde/programs/dtappbuilder/src/ab/proj.c index d2bfa97c..975b6c09 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) && !defined(__FreeBSD__) +#if !defined(linux) && !defined(CSRG_BASED) 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 d0e69008..dae3c5e1 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) && !defined(__FreeBSD__) +#if !defined(linux) && !defined(CSRG_BASED) 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 6754a1a6..0a787f93 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) && !defined(__FreeBSD__) +#if !defined(linux) && !defined(CSRG_BASED) extern char *sys_errlist[]; #endif diff --git a/cde/programs/dtappbuilder/src/abmf/write_c.c b/cde/programs/dtappbuilder/src/abmf/write_c.c index 7a41b85e..2b30d400 100644 --- a/cde/programs/dtappbuilder/src/abmf/write_c.c +++ b/cde/programs/dtappbuilder/src/abmf/write_c.c @@ -350,9 +350,9 @@ write_func_def_params( va_list va_params ) { -#if defined(__ppc) || defined(linux) || defined(__OpenBSD__) +#if defined(__ppc) #define va_start_params() __va_copy(params, va_params) -#elif defined(__FreeBSD__) +#elif defined(CSRG_BASED) || defined(linux) #define va_start_params() va_copy(params, va_params) #else #define va_start_params() (params = va_params) diff --git a/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c b/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c index def0f7ff..3a82118f 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) && !defined(__FreeBSD__) +#if !defined(linux) && !defined(CSRG_BASED) extern char *sys_errlist[]; #endif diff --git a/cde/programs/dtcm/dtcm/cm_i18n.c b/cde/programs/dtcm/dtcm/cm_i18n.c index 0b15d2f6..a64128e0 100644 --- a/cde/programs/dtcm/dtcm/cm_i18n.c +++ b/cde/programs/dtcm/dtcm/cm_i18n.c @@ -388,7 +388,7 @@ cm_printf(double value, int decimal_pt) } #ifdef SunOS fconvert(value, decimal_pt, &deci_pt, &sign, buf); -#elif defined(__FreeBSD__) +#elif defined(CSRG_BASED) snprintf(buf, decimal_pt, "%f", value); #else /* this version, available on the HP and AIX machine is not reentrant. */ diff --git a/cde/programs/dtcm/dtcm/dnd.c b/cde/programs/dtcm/dtcm/dnd.c index 9f47dd5f..553c058e 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) && !defined(__FreeBSD__) +#if !defined(linux) && !defined(CSRG_BASED) extern char *sys_errlist[]; #endif diff --git a/cde/programs/dtexec/Main.c b/cde/programs/dtexec/Main.c index 60c6d228..b871e526 100644 --- a/cde/programs/dtexec/Main.c +++ b/cde/programs/dtexec/Main.c @@ -323,7 +323,7 @@ Help( *****************************************************************************/ static void -#if defined(__aix) || defined (__osf__) || defined(__FreeBSD__) || defined(linux) +#if defined(__aix) || defined (__osf__) || defined(CSRG_BASED) || defined(linux) PanicSignal(int s) #else PanicSignal(void) @@ -360,7 +360,7 @@ PanicSignal(void) *****************************************************************************/ static void -#if defined(__aix) || defined (__osf__) || defined(__FreeBSD__) || defined(linux) +#if defined(__aix) || defined (__osf__) || defined(CSRG_BASED) || defined(linux) IgnoreSignal(int i) #else IgnoreSignal(void) @@ -402,7 +402,7 @@ IgnoreSignal(void) *****************************************************************************/ static void -#if defined(__aix) || defined (__osf__) || defined(__FreeBSD__) || defined(linux) +#if defined(__aix) || defined (__osf__) || defined(CSRG_BASED) || defined(linux) UrgentSignal(int i) #else UrgentSignal(void) @@ -453,7 +453,7 @@ UrgentSignal(void) * *****************************************************************************/ static void -#if defined(__aix) || defined (__osf__) || defined(__FreeBSD__) || defined(linux) +#if defined(__aix) || defined (__osf__) || defined(CSRG_BASED) || defined(linux) SigCld(int i) #else SigCld(void) @@ -1525,7 +1525,7 @@ main ( * a SIGCLD, give up and exit. */ if (rediscoverUrgentSigG > ((1000/SHORT_SELECT_TIMEOUT)*5) ) { -#if defined(__aix) || defined (__osf__) || defined(__FreeBSD__) || defined(linux) +#if defined(__aix) || defined (__osf__) || defined(CSRG_BASED) || defined(linux) PanicSignal(0); #else PanicSignal(); diff --git a/cde/programs/dtimsstart/remote.c b/cde/programs/dtimsstart/remote.c index 476c7d00..7a143e92 100644 --- a/cde/programs/dtimsstart/remote.c +++ b/cde/programs/dtimsstart/remote.c @@ -37,7 +37,7 @@ #include /* for X_ChangeHosts */ #include /* for XA_STRING */ -#if !defined(linux) && !defined(__FreeBSD__) +#if !defined(linux) && !defined(CSRG_BASED) extern char *sys_errlist[]; #endif diff --git a/cde/programs/dtimsstart/start.c b/cde/programs/dtimsstart/start.c index 085403a0..5c647d46 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) && !defined(__FreeBSD__) +#if !defined(linux) && !defined(CSRG_BASED) extern char *sys_errlist[]; extern int sys_nerr; #endif diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c b/cde/programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c index 361bd146..e4834209 100644 --- a/cde/programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c +++ b/cde/programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c @@ -214,7 +214,7 @@ hashalloc __PARAM__((Hash_table_t* ref, ...), (va_alist)) __OTORP__(va_dcl) tab->flags |= HASH_STATIC; break; case HASH_va_list: -#if defined(__FreeBSD__) && !defined(__LP64__) +#if defined(CSRG_BASED) && !defined(__LP64__) if (vp < &va[elementsof(va)]) *vp++ = ap; ap = va_arg(ap, va_list); #else @@ -230,7 +230,7 @@ hashalloc __PARAM__((Hash_table_t* ref, ...), (va_alist)) __OTORP__(va_dcl) case 0: if (vp > va) { -#if defined(__FreeBSD__) && !defined(__LP64__) +#if defined(CSRG_BASED) && !defined(__LP64__) ap = *--vp; #else vp--; diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c index 4a93a8d2..214bb50e 100644 --- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c +++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c @@ -301,7 +301,7 @@ loop_fa : GETARG(form,form,argf,args,char*,char*,'1',t_user,n_user); if(!form) form = ""; -#if defined(__FreeBSD__) && !defined(__LP64__) +#if defined(CSRG_BASED) && !defined(__LP64__) GETARG(argsp,argsp,argf,args,va_list*,va_list*,'2',t_user,n_user); memcpy((Void_t*)(&(fa->args)), (Void_t*)(&args), sizeof(va_list)); memcpy((Void_t*)(&args), (Void_t*)argsp, sizeof(va_list)); @@ -319,7 +319,7 @@ loop_fa : default : /* unknown directive */ if(extf) { -#if defined(__FreeBSD__) && !defined(__LP64__) +#if defined(CSRG_BASED) && !defined(__LP64__) va_list savarg = args; /* is this portable? */ #else va_list savarg; /* is this portable? Sorry .. NO. */ @@ -332,7 +332,7 @@ loop_fa : if((sp = astr) ) goto s_format; -#if defined(__FreeBSD__) && !defined(__LP64__) +#if defined(CSRG_BASED) && !defined(__LP64__) args = savarg; /* extf failed, treat as if unmatched */ #else __va_copy( args, savarg ); /* extf failed, treat as if unmatched */ diff --git a/cde/programs/dtudcexch/exportbdf.c b/cde/programs/dtudcexch/exportbdf.c index ef5ad51f..dbcc228d 100644 --- a/cde/programs/dtudcexch/exportbdf.c +++ b/cde/programs/dtudcexch/exportbdf.c @@ -212,7 +212,7 @@ char **comment_list ;/* pointer to the list of comments */ int cnt ; int comflg ; pid_t chld_pid = 0; -#if defined( SVR4 ) || defined( SYSV ) || defined(__FreeBSD__) +#if defined( SVR4 ) || defined( SYSV ) || defined(CSRG_BASED) int chld_stat ; #else union wait chld_stat ; diff --git a/cde/programs/dtudcfonted/dtaddcpf/addcpf.c b/cde/programs/dtudcfonted/dtaddcpf/addcpf.c index eb876bd3..88db180a 100644 --- a/cde/programs/dtudcfonted/dtaddcpf/addcpf.c +++ b/cde/programs/dtudcfonted/dtaddcpf/addcpf.c @@ -86,7 +86,7 @@ static char *util_locale ; static pid_t gtob_pid = 0; static pid_t btop_pid = 0; -#if defined( SVR4 ) || defined( SYSV ) || defined(__osf__) || defined(__FreeBSD__) +#if defined( SVR4 ) || defined( SYSV ) || defined(__osf__) || defined(CSRG_BASED) static int chld_stat ; #else static union wait chld_stat ; diff --git a/cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c b/cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c index 8df38cd4..935e9f47 100644 --- a/cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c +++ b/cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c @@ -102,7 +102,7 @@ char *argv[]; char *style ; /* style */ int chk_fd; pid_t chld_pid = 0; -#if defined( SVR4 ) || defined( SYSV ) || defined(__FreeBSD__) +#if defined( SVR4 ) || defined( SYSV ) || defined(CSRG_BASED) int chld_stat ; #else union wait chld_stat ; diff --git a/cde/programs/dtudcfonted/libfuty/getfname.c b/cde/programs/dtudcfonted/libfuty/getfname.c index e145874f..21f92ddc 100644 --- a/cde/programs/dtudcfonted/libfuty/getfname.c +++ b/cde/programs/dtudcfonted/libfuty/getfname.c @@ -1047,7 +1047,7 @@ char **fontname ; { FILE *fp ; pid_t chld_pid = 0; -#if defined( SVR4 ) || defined( SYSV ) || defined(__FreeBSD__) +#if defined( SVR4 ) || defined( SYSV ) || defined(CSRG_BASED) int chld_stat ; #else union wait chld_stat ; diff --git a/cde/programs/dtudcfonted/libfuty/oakfuty.c b/cde/programs/dtudcfonted/libfuty/oakfuty.c index aa2ca718..0b73c56a 100644 --- a/cde/programs/dtudcfonted/libfuty/oakfuty.c +++ b/cde/programs/dtudcfonted/libfuty/oakfuty.c @@ -190,7 +190,7 @@ struct ptobhead *head; char buf[BUFSIZE], *p; pid_t chld_pid = 0; -#if defined( SVR4 ) || defined( SYSV ) || defined(__FreeBSD__) +#if defined( SVR4 ) || defined( SYSV ) || defined(CSRG_BASED) int chld_stat ; #else union wait chld_stat ;