external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

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.

Browse source
This commit is contained in:
Jelle Hermsen 2012-09-29 13:14:57 +02:00 • committed by Jon Trulson
parent 8cfdf21526
commit b8862cab32
23 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cde/lib/DtSearch/raima/vista.h
View file

@ -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

2
cde/lib/tt/bin/dbck/options.C
View file

@ -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"

2
cde/lib/tt/bin/tt_type_comp/mp_type_comp.C
View file

@ -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__)

2
cde/lib/tt/bin/ttdbserverd/db_server_svc.C
View file

@ -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

2
cde/lib/tt/bin/ttsession/mp_server.C
View file

@ -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

2
cde/programs/dtappbuilder/src/ab/palette_stubs.c
View file

@ -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

2
cde/programs/dtappbuilder/src/ab/proj.c
View file

@ -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 */

2
cde/programs/dtappbuilder/src/ab/projP_utils.c
View file

@ -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 */

2
cde/programs/dtappbuilder/src/ab/proj_utils.c
View file

@ -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

4
cde/programs/dtappbuilder/src/abmf/write_c.c
View file

@ -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)

2
cde/programs/dtappbuilder/src/libABil/bil_loadfile.c
View file

@ -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

2
cde/programs/dtcm/dtcm/cm_i18n.c
View file

@ -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. */

2
cde/programs/dtcm/dtcm/dnd.c
View file

@ -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

10
cde/programs/dtexec/Main.c
View file

@ -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();

2
cde/programs/dtimsstart/remote.c
View file

@ -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

2
cde/programs/dtimsstart/start.c
View file

@ -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

4
cde/programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c
View file

@ -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--;

6
cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c
View file

@ -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 */

2
cde/programs/dtudcexch/exportbdf.c
View file

@ -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 ;

2
cde/programs/dtudcfonted/dtaddcpf/addcpf.c
View file

@ -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 ;

2
cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c
View file

@ -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 ;

2
cde/programs/dtudcfonted/libfuty/getfname.c
View file

@ -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 ;

2
cde/programs/dtudcfonted/libfuty/oakfuty.c
View file

@ -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 ;