diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-06 00:35:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:34 -0500 |
| commit | b7477fb3881ac4490da040b054094a865128b951 (patch) | |
| tree | 51356e55b99a6abecc5d002463f8f149d7a9f031 /source4/include | |
| parent | 6d2dd5a2383410e3f50a9765b45c364a2d75a984 (diff) | |
| download | samba-b7477fb3881ac4490da040b054094a865128b951.tar.gz samba-b7477fb3881ac4490da040b054094a865128b951.tar.xz samba-b7477fb3881ac4490da040b054094a865128b951.zip | |
r18117: first steps in making samba4 use libreplace
(This used to be commit c079cedb084d621c5a0aac59310b237ba375df20)
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/includes.h | 3 | ||||
| -rw-r--r-- | source4/include/system/config.m4 | 12 | ||||
| -rw-r--r-- | source4/include/system/wait.h | 7 |
3 files changed, 1 insertions, 21 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index 6252a59c2f6..37661aaaa8c 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -22,7 +22,7 @@ */ #ifndef NO_CONFIG_H /* for some tests */ -#include "config.h" +#include "replace.h" #endif #include "local.h" @@ -90,7 +90,6 @@ _PUBLIC_ void smb_panic(const char *why) NORETURN_ATTRIBUTE; #endif #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) -#include "lib/replace/replace.h" /* Lists, trees, caching, database... */ #include "talloc/talloc.h" diff --git a/source4/include/system/config.m4 b/source4/include/system/config.m4 index 8e7448bbe49..4d66317a5ee 100644 --- a/source4/include/system/config.m4 +++ b/source4/include/system/config.m4 @@ -11,18 +11,6 @@ AC_HEADER_TIME # wait AC_HEADER_SYS_WAIT -AC_CACHE_CHECK([for sig_atomic_t type],samba_cv_sig_atomic_t, [ - AC_TRY_COMPILE([ -#include <sys/types.h> -#if STDC_HEADERS -#include <stdlib.h> -#include <stddef.h> -#endif -#include <signal.h>],[sig_atomic_t i = 0], - samba_cv_sig_atomic_t=yes,samba_cv_sig_atomic_t=no)]) -if test x"$samba_cv_sig_atomic_t" = x"yes"; then - AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type]) -fi # capability AC_CHECK_HEADERS(sys/capability.h) diff --git a/source4/include/system/wait.h b/source4/include/system/wait.h index 543233ce82d..dc129ac1088 100644 --- a/source4/include/system/wait.h +++ b/source4/include/system/wait.h @@ -24,13 +24,6 @@ #include <sys/wait.h> #endif -/* - * Define additional missing types - */ -#ifndef HAVE_SIG_ATOMIC_T_TYPE -typedef int sig_atomic_t; -#endif - #ifndef SIGCLD #define SIGCLD SIGCHLD #endif |