diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-03-19 19:31:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:08 -0500 |
| commit | 105660d3f9b537fa47fe6e33c0418a1d8f85e0e9 (patch) | |
| tree | d2dc24b88f363ab04f63a48de22486de22629aa2 /source4/lib/popt/system.h | |
| parent | 63b5ad6d5403f97423af0e8c542714ed691e667f (diff) | |
| download | samba-105660d3f9b537fa47fe6e33c0418a1d8f85e0e9.tar.gz samba-105660d3f9b537fa47fe6e33c0418a1d8f85e0e9.tar.bz2 samba-105660d3f9b537fa47fe6e33c0418a1d8f85e0e9.zip | |
r5906: Fix the usage of the internal popt (make proto should ignore it)
Updated included popt to 1.7.
(This used to be commit d60cb643e8a46771f3d836307ea45b869f34dc9b)
Diffstat (limited to 'source4/lib/popt/system.h')
| -rw-r--r-- | source4/lib/popt/system.h | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/source4/lib/popt/system.h b/source4/lib/popt/system.h index 059c045817..000e23d484 100644 --- a/source4/lib/popt/system.h +++ b/source4/lib/popt/system.h @@ -1,6 +1,16 @@ #include "config.h" +#if defined (__GLIBC__) && defined(__LCLINT__) +/*@-declundef@*/ +/*@unchecked@*/ +extern __const __int32_t *__ctype_tolower; +/*@unchecked@*/ +extern __const __int32_t *__ctype_toupper; +/*@=declundef@*/ +#endif + #include <ctype.h> + #include <errno.h> #include <fcntl.h> #include <limits.h> @@ -23,6 +33,14 @@ #include <libc.h> #endif +#if defined(__LCLINT__) +/*@-declundef -incondefs -redecl@*/ /* LCL: missing annotation */ +/*@only@*/ void * alloca (size_t __size) + /*@ensures MaxSet(result) == (__size - 1) @*/ + /*@*/; +/*@=declundef =incondefs =redecl@*/ +#endif + /* AIX requires this to be the first thing in the file. */ #ifndef __GNUC__ # if HAVE_ALLOCA_H @@ -40,7 +58,10 @@ char *alloca (); #define alloca __builtin_alloca #endif -/*@only@*/ char * xstrdup (const char *str); +/*@-redecl -redef@*/ +/*@mayexit@*/ /*@only@*/ char * xstrdup (const char *str) + /*@*/; +/*@=redecl =redef@*/ #if HAVE_MCHECK_H && defined(__GNUC__) #define vmefail() (fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL) |