diff options
| author | Wayne Davison <wayned@samba.org> | 2006-11-09 01:26:27 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2006-11-09 01:26:27 +0000 |
| commit | 9775d6ab66dc59e05f0daa4f6048d24bc7989602 (patch) | |
| tree | 57d36964e100e455da99efa7128b514450f58e65 /popt | |
| parent | 2b916250d8cc131dfe8bb49bfb749332a7b78d7d (diff) | |
| download | rsync-9775d6ab66dc59e05f0daa4f6048d24bc7989602.tar.gz rsync-9775d6ab66dc59e05f0daa4f6048d24bc7989602.tar.bz2 rsync-9775d6ab66dc59e05f0daa4f6048d24bc7989602.zip | |
- Define snprintf() when needed.
- Improved the compatibility of the standard includes.
Diffstat (limited to 'popt')
| -rw-r--r-- | popt/system.h | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/popt/system.h b/popt/system.h index db63dd4b..6f496ed5 100644 --- a/popt/system.h +++ b/popt/system.h @@ -22,11 +22,28 @@ extern __const __int32_t *__ctype_toupper; #endif #include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#if HAVE_UNISTD_H -#include <unistd.h> +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#ifdef STDC_HEADERS +# include <stdlib.h> +# include <stddef.h> +#else +# ifdef HAVE_STDLIB_H +# include <stdlib.h> +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include <memory.h> +# endif +# include <string.h> +#endif +#ifdef HAVE_STRINGS_H +# include <strings.h> +#endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> #endif #ifndef __GNUC__ @@ -97,6 +114,11 @@ size_t strlcpy(char *d, const char *s, size_t bufsize); size_t strlcat(char *d, const char *s, size_t bufsize); #endif +#if !defined HAVE_SNPRINTF || !defined HAVE_C99_VSNPRINTF +#define snprintf rsync_snprintf +int snprintf(char *str,size_t count,const char *fmt,...); +#endif + #define UNUSED(x) x __attribute__((__unused__)) #define PACKAGE "rsync" |