debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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

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