Changed a couple of ifdefs for __FreeBSD__ to CSRG_BASED. These are all clearcut...

diff --git a/cde/lib/DtSearch/raima/vista.h b/cde/lib/DtSearch/raima/vista.h
index 704e9955c45d9cf9db819896043bf5978fb353e2..ba0c273308c98e166ea829f08296e3d0a935da5b 100644 (file)
--- 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 <limits.h>    /* 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 a0ef6bc9599f5a238756b35ac348cbbde3942c99..bebfc4fac4c52419b070e0d53379071e6e49227d 100644 (file)
--- a/cde/lib/tt/bin/dbck/options.C
+++ b/cde/lib/tt/bin/dbck/options.C
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "util/copyright.h"
-#if defined(linux) || defined(sgi) || defined(__FreeBSD__)
+#if defined(linux) || defined(sgi) || defined(CSRG_BASED)
 #include <getopt.h>
 #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 3737fa1bb563379b2268b48982549b4346c3c32a..267ec6f1e5e4272f716af6a0bf67b40d4c1420d2 100644 (file)
--- 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 <unistd.h>
 #endif
-#if defined(sgi) || defined(__FreeBSD__)
+#if defined(sgi) || defined(CSRG_BASED)
 #include <getopt.h>
 #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 c2560821b6a801a6bf807be970dd8adc701b0228..bc48e6e5a86fd6855904deb66ef9f9b70a6fd984 100644 (file)
--- 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 <termios.h>
 #include <time.h>
 
-#if defined(sgi) || defined(__FreeBSD__)
+#if defined(sgi) || defined(CSRG_BASED)
 #include <getopt.h>
 #endif
 

diff --git a/cde/lib/tt/bin/ttsession/mp_server.C b/cde/lib/tt/bin/ttsession/mp_server.C
index 1afa057634074bec7b22ff62ab5f00ef7fda3def..18b58a86d941c633da48d083002585aa342fbbad 100644 (file)
--- a/cde/lib/tt/bin/ttsession/mp_server.C
+++ b/cde/lib/tt/bin/ttsession/mp_server.C
@@ -53,7 +53,7 @@
 
 #include <sys/resource.h>
 #include <unistd.h>
-#if defined(sgi) || defined(__FreeBSD__)
+#if defined(sgi) || defined(CSRG_BASED)
 #include <getopt.h>
 #endif
 

diff --git a/cde/programs/dtappbuilder/src/ab/palette_stubs.c b/cde/programs/dtappbuilder/src/ab/palette_stubs.c
index da9e97a44d084b4f59fc6bf5e541bd39093f5a91..5cd12c2c9b92f8b8e31ef4318925ec5ad556c06f 100644 (file)
--- 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 d2bfa97c347674962ed18a561bd7189f1c3201da..975b6c092133d79f27fb25f12cf7ee69f2f31142 100644 (file)
--- 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 d0e690081cbd956a6c597c542134cc2ad1885a3f..dae3c5e1e6594f13b8c746b3e8fe9db05d492988 100644 (file)
--- 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 6754a1a6dc18fb7b638a9cf9f1810061b189d69e..0a787f93ab1db6f4a12bafaf5963eacf5f4fba5e 100644 (file)
--- 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 7a41b85e3ea27055bc57542218e54df421ea2f00..2b30d40099bab5bd9cf423b0ec54ad0df5830f5d 100644 (file)
--- 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 def0f7ff05edeac0c3c6ef02b419a5047cd3463a..3a82118f75d098621f07793ce4ec5f66625216c0 100644 (file)
--- 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 0b15d2f6439aafc6790e6c6f503b610b68ccc796..a64128e04223595fab6f192acca3e246ea0c30f6 100644 (file)
--- 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 9f47dd5f460a63c00ae2f7f549b34fa88cd2e304..553c058e214292061e57c96f208c4e7fa27ff288 100644 (file)
--- 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 60c6d2282045daf1ac9853cc40ddceaf94f08996..b871e52628dc7a0c8fe5b5033f7ef2dd7cb32c6f 100644 (file)
--- 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 476c7d007a147cbf499a520326a4851c81eb55cb..7a143e926a2ae79d45f9450492ec878d9c90dbf8 100644 (file)
--- 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) && !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 085403a06fd988493b097a944a70b71401a912a1..5c647d46daab24968b30c71a7d7d54ffd32daee2 100644 (file)
--- 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 361bd1463297563e70f57bfe5902d66e2d82a420..e4834209977ee9349bf9c7e35969d62e28fe5def 100644 (file)
--- 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 4a93a8d21446277d02d7e8364081e57c9b2cdb5e..214bb50ee39b9179ede6944c500cbf6972371547 100644 (file)
--- 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 ef5ad51f47de176707985b0eb7aea7f94e98a214..dbcc228d274f4b43adab56dab271f898ecc18439 100644 (file)
--- 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 eb876bd39770157e8a5edd8886dfb366240a2a3e..88db180a6431f0c15775adcb881b7e031da7fa1c 100644 (file)
--- 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 8df38cd445d119c7721306cd1ddf57ffbae10621..935e9f473d288d2a58f28b312619e8455e92f781 100644 (file)
--- 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 e145874ffbec2f9672f677d9079634fc0e85be8e..21f92ddceebd57aede79a58f860d66f330cd65e3 100644 (file)
--- 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 aa2ca718e0f1ecdfcf240d510bdd55558a7b4205..0b73c56a597b919c34bb7290ab6c356160aa7919 100644 (file)
--- 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 ;