diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-06-25 02:53:13 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-06-25 02:53:13 +0000 |
| commit | b95a294a0879e800e816281a80d0074224cd8cd4 (patch) | |
| tree | f6f57c9b0138c1a3027fa1ed78186d9df0830c0d /source3/include | |
| parent | 413ad23faff509332985d6972c931900af2fd5f5 (diff) | |
| download | samba-b95a294a0879e800e816281a80d0074224cd8cd4.tar.gz samba-b95a294a0879e800e816281a80d0074224cd8cd4.tar.bz2 samba-b95a294a0879e800e816281a80d0074224cd8cd4.zip | |
fixed usage of socklen_t and also tidied up SIG_ATOMIC_T, using a typedef instead of a define
(This used to be commit e2ecff419fdc0a0dc7551b33b377dc11061ef2a3)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/config.h.in | 3 | ||||
| -rw-r--r-- | source3/include/includes.h | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in index 53ac824736..8c8f26f8b2 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -1,4 +1,4 @@ -/* include/config.h.in. Generated automatically from configure.in by autoheader. */ +/* include/config.h.in. Generated automatically from configure.in by autoheader 2.13. */ /* Define if on AIX 3. System headers sometimes define this. @@ -71,6 +71,7 @@ #undef HAVE_UNSIGNED_CHAR #undef HAVE_UTIMBUF #undef HAVE_SIG_ATOMIC_T_TYPE +#undef HAVE_SOCKLEN_T_TYPE #undef ssize_t #undef ino_t #undef ssize_t diff --git a/source3/include/includes.h b/source3/include/includes.h index 899c9f3a42..32f8429345 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -372,15 +372,17 @@ #endif /* - * Define SIG_ATOMIC_T if needed. + * Define additional missing types */ +#ifndef HAVE_SIG_ATOMIC_T_TYPE +typedef int sig_atomic_t; +#endif -#if defined(HAVE_SIG_ATOMIC_T_TYPE) -#define SIG_ATOMIC_T sig_atomic_t -#else -#define SIG_ATOMIC_T int +#ifndef HAVE_SOCKLEN_T_TYPE +typedef int socklen_t; #endif + #ifndef uchar #define uchar unsigned char #endif |