debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FreeBSD 10 clang port

Browse Source
This commit is contained in:
Ulrich Wilkens
2014-07-27 16:48:57 +02:00
committed by Jon Trulson
parent 8d0551bfda
commit c3f74eec17
99 changed files with 510 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cde/programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c
View File

@@ -89,6 +89,8 @@
#else
#define __VA_START__(p,a) va_start(p)
#endif
#define va_listval(p) (*(p))
#define va_listarg va_list*
#endif
static const char id_hash[] = "\n@(#)hash (AT&T Bell Laboratories) 05/09/95\0\n";
@@ -112,7 +114,7 @@ hashalloc __PARAM__((Hash_table_t* ref, ...), (va_alist)) __OTORP__(va_dcl)
register Hash_table_t* ret = 0;
register int internal;
int n;
va_list ap, vl;
va_list ap;
va_list va[4];
va_list* vp = va;
HASHregion region = 0;
@@ -223,8 +225,7 @@ hashalloc __PARAM__((Hash_table_t* ref, ...), (va_alist)) __OTORP__(va_dcl)
__va_copy( *vp, ap );
vp++;
}
vl = va_arg(ap, va_list);
__va_copy(ap, vl);
__va_copy(ap, va_listval(va_arg(ap, va_listarg)));
#endif
break;
case 0:

6
cde/programs/dtksh/ksh93/src/lib/libast/string/tokscan.c
View File

@@ -89,6 +89,8 @@
#else
#define __VA_START__(p,a) va_start(p)
#endif
#define va_listval(p) (*(p))
#define va_listarg va_list*
#endif
#include <ast.h>
@@ -213,7 +215,6 @@ tokscan __PARAM__((register char* s, char** nxt, const char* fmt, ...), (va_alis
char** p_string;
char* prv_f = 0;
va_list prv_ap;
va_list* pap;
__VA_START__(ap, fmt); __OTORP__(s = va_arg(ap, char* );nxt = va_arg(ap, char** );fmt = va_arg(ap, const char* );)
if (!*s || *s == '\n')
@@ -258,8 +259,7 @@ tokscan __PARAM__((register char* s, char** nxt, const char* fmt, ...), (va_alis
prv_f = f;
f = va_arg(ap, char*);
__va_copy( prv_ap, ap );
pap = va_arg(ap, va_list*);
__va_copy( ap, pap );
__va_copy(ap, va_listval(va_arg(ap, va_listarg)));
continue;
case 'c':
p_char = va_arg(ap, char*);