diff options
author | James Peach <jpeach@samba.org> | 2006-05-17 00:04:09 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:17:05 -0500 |
commit | dc64af1d2ee478254b57c323795736e85d2aed92 (patch) | |
tree | e7e72773994ce1309ff42a6dd32c6670b002bd0b /source3/popt/system.h | |
parent | f81e4521bf9408754a9873646fd7e911d968b4e1 (diff) | |
download | samba-dc64af1d2ee478254b57c323795736e85d2aed92.tar.gz samba-dc64af1d2ee478254b57c323795736e85d2aed92.tar.xz samba-dc64af1d2ee478254b57c323795736e85d2aed92.zip |
r15654: Update our internal copy of popt to that distributed with the RPM 4.2
source code.
(This used to be commit 9559886a92b1fdd33d380bf0100dcddb12477ff2)
Diffstat (limited to 'source3/popt/system.h')
-rw-r--r-- | source3/popt/system.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/source3/popt/system.h b/source3/popt/system.h index 059c0458176..1d1b9dae887 100644 --- a/source3/popt/system.h +++ b/source3/popt/system.h @@ -1,6 +1,18 @@ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif + +#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 +35,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 +60,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) |