svn commit: samba r20816 - in branches/SAMBA_4_0/source: . lib/replace lib/replace/system web_server

[metze at samba.org]

Author: metze
Date: 2007-01-15 19:08:03 +0000 (Mon, 15 Jan 2007)
New Revision: 20816

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20816

Log:
merge from samba3:

include setjmp.h via system/wait.h

metze
Removed:
   branches/SAMBA_4_0/source/web_server/config.m4
Modified:
   branches/SAMBA_4_0/source/configure.ac
   branches/SAMBA_4_0/source/lib/replace/libreplace.m4
   branches/SAMBA_4_0/source/lib/replace/system/wait.h
   branches/SAMBA_4_0/source/web_server/http.c


Changeset:
Modified: branches/SAMBA_4_0/source/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/configure.ac	2007-01-15 19:05:11 UTC (rev 20815)
+++ branches/SAMBA_4_0/source/configure.ac	2007-01-15 19:08:03 UTC (rev 20816)
@@ -42,7 +42,6 @@
 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)

Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2007-01-15 19:05:11 UTC (rev 20815)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2007-01-15 19:08:03 UTC (rev 20816)
@@ -62,6 +62,7 @@
 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])],,

Modified: branches/SAMBA_4_0/source/lib/replace/system/wait.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/system/wait.h	2007-01-15 19:05:11 UTC (rev 20815)
+++ branches/SAMBA_4_0/source/lib/replace/system/wait.h	2007-01-15 19:08:03 UTC (rev 20816)
@@ -36,4 +36,8 @@
 #define SIGNAL_CAST (RETSIGTYPE (*)(int))
 #endif
 
+#ifdef HAVE_SETJMP_H
+#include <setjmp.h>
 #endif
+
+#endif

Deleted: branches/SAMBA_4_0/source/web_server/config.m4
===================================================================
--- branches/SAMBA_4_0/source/web_server/config.m4	2007-01-15 19:05:11 UTC (rev 20815)
+++ branches/SAMBA_4_0/source/web_server/config.m4	2007-01-15 19:08:03 UTC (rev 20816)
@@ -1,2 +0,0 @@
-AC_CHECK_HEADERS(setjmp.h)
-

Modified: branches/SAMBA_4_0/source/web_server/http.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/http.c	2007-01-15 19:05:11 UTC (rev 20815)
+++ branches/SAMBA_4_0/source/web_server/http.c	2007-01-15 19:08:03 UTC (rev 20816)
@@ -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 @@
    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;