diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-01-15 19:08:03 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:43:35 -0500 |
| commit | 71f6a4d05bf46ca9456a3bc9f2d3263936b18ae2 (patch) | |
| tree | 2ad2fb382def2d3b576afcd55e71358379909e0c | |
| parent | 28438101bd07a96ef5a3725660eb43b486a0eae0 (diff) | |
| download | samba-71f6a4d05bf46ca9456a3bc9f2d3263936b18ae2.tar.gz samba-71f6a4d05bf46ca9456a3bc9f2d3263936b18ae2.tar.bz2 samba-71f6a4d05bf46ca9456a3bc9f2d3263936b18ae2.zip | |
r20816: merge from samba3:
include setjmp.h via system/wait.h
metze
(This used to be commit 1b10cbb62950693760d4af6ab8691a4ba70908c9)
| -rw-r--r-- | source4/configure.ac | 1 | ||||
| -rw-r--r-- | source4/lib/replace/libreplace.m4 | 1 | ||||
| -rw-r--r-- | source4/lib/replace/system/wait.h | 4 | ||||
| -rw-r--r-- | source4/web_server/config.m4 | 2 | ||||
| -rw-r--r-- | source4/web_server/http.c | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index 5681471217..e75da107c9 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -42,7 +42,6 @@ m4_include(gtk/config.m4) m4_include(ntvfs/posix/config.m4) m4_include(ntvfs/unixuid/config.m4) m4_include(lib/socket_wrapper/config.m4) -m4_include(web_server/config.m4) m4_include(auth/config.m4) m4_include(kdc/config.m4) m4_include(ntvfs/sysdep/config.m4) diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4 index dff6098297..3328dea95e 100644 --- a/source4/lib/replace/libreplace.m4 +++ b/source4/lib/replace/libreplace.m4 @@ -62,6 +62,7 @@ AC_FUNC_MEMCMP AC_CHECK_FUNCS(pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp) AC_CHECK_HEADERS(stdbool.h sys/select.h) +AC_CHECK_HEADERS(setjmp.h) AC_CHECK_TYPE(bool, [AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],, diff --git a/source4/lib/replace/system/wait.h b/source4/lib/replace/system/wait.h index c2041a5938..3855f7ae72 100644 --- a/source4/lib/replace/system/wait.h +++ b/source4/lib/replace/system/wait.h @@ -36,4 +36,8 @@ #define SIGNAL_CAST (RETSIGTYPE (*)(int)) #endif +#ifdef HAVE_SETJMP_H +#include <setjmp.h> +#endif + #endif diff --git a/source4/web_server/config.m4 b/source4/web_server/config.m4 deleted file mode 100644 index 2dd5e5b823..0000000000 --- a/source4/web_server/config.m4 +++ /dev/null @@ -1,2 +0,0 @@ -AC_CHECK_HEADERS(setjmp.h) - diff --git a/source4/web_server/http.c b/source4/web_server/http.c index 30ca17411e..8c6cb1fa3a 100644 --- a/source4/web_server/http.c +++ b/source4/web_server/http.c @@ -27,6 +27,7 @@ #include "smbd/service.h" #include "lib/events/events.h" #include "system/time.h" +#include "system/wait.h" #include "lib/appweb/esp/esp.h" #include "lib/appweb/ejs/ejsInternal.h" #include "lib/util/dlinklist.h" @@ -484,7 +485,6 @@ static void http_setup_arrays(struct esp_state *esp) it hits a major error. We need to catch these and report a internal server error via http */ -#include <setjmp.h> static jmp_buf ejs_exception_buf; static const char *exception_reason; |