[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8173 - in libmicrohttpd: . src/daemon src/include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r8173 - in libmicrohttpd: . src/daemon src/include |
Date: |
Mon, 2 Feb 2009 20:29:21 -0700 (MST) |
Author: grothoff
Date: 2009-02-02 20:29:21 -0700 (Mon, 02 Feb 2009)
New Revision: 8173
Modified:
libmicrohttpd/configure.ac
libmicrohttpd/src/daemon/daemon.c
libmicrohttpd/src/daemon/internal.h
libmicrohttpd/src/include/microhttpd.h
libmicrohttpd/src/include/platform.h
Log:
zos fixes
Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac 2009-02-02 22:24:04 UTC (rev 8172)
+++ libmicrohttpd/configure.ac 2009-02-03 03:29:21 UTC (rev 8173)
@@ -37,16 +37,16 @@
if test `uname -s` = "OS/390"
then
# configure binaries for z/OS
- if test -z $CC
+ if test -z "$CC"
then
CC=`pwd`"/contrib/xcc"
chmod +x $CC || true
fi
- if test -z $CPP
+ if test -z "$CPP"
then
CPP="c89 -E"
fi
- if test -z $CXXCPP
+ if test -z "$CXXCPP"
then
CXXCPP="c++ -E -+"
fi
@@ -143,7 +143,7 @@
AC_CHECK_HEADERS([fcntl.h math.h errno.h limits.h stdio.h locale.h sys/stat.h
sys/types.h pthread.h],,AC_MSG_ERROR([Compiling libmicrohttpd requires standard
UNIX headers files]))
# Check for optional headers
-AC_CHECK_HEADERS([sys/select.h sys/types.h sys/time.h sys/msg.h netdb.h
netinet/in.h netinet/tcp.h time.h sys/socket.h sys/mman.h arpa/inet.h])
+AC_CHECK_HEADERS([sys/types.h sys/time.h sys/msg.h netdb.h netinet/in.h
netinet/tcp.h time.h sys/socket.h sys/mman.h arpa/inet.h sys/select.h])
AC_CHECK_FUNCS(memmem)
Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c 2009-02-02 22:24:04 UTC (rev 8172)
+++ libmicrohttpd/src/daemon/daemon.c 2009-02-03 03:29:21 UTC (rev 8173)
@@ -882,7 +882,7 @@
break;
case MHD_OPTION_URI_LOG_CALLBACK:
retVal->uri_log_callback =
- va_arg (ap, void *(*)(void *cls, const char *uri));
+ va_arg (ap, LogCallback);
retVal->uri_log_callback_cls = va_arg (ap, void *);
break;
#if HTTPS_SUPPORT
Modified: libmicrohttpd/src/daemon/internal.h
===================================================================
--- libmicrohttpd/src/daemon/internal.h 2009-02-02 22:24:04 UTC (rev 8172)
+++ libmicrohttpd/src/daemon/internal.h 2009-02-03 03:29:21 UTC (rev 8173)
@@ -605,6 +605,8 @@
#endif
};
+typedef void * (*LogCallback)(void * cls, const char * uri);
+
/**
* State kept for each MHD daemon.
*/
@@ -656,7 +658,7 @@
* Returns the initial pointer to internal state
* kept by the client for the request.
*/
- void *(*uri_log_callback) (void *cls, const char *uri);
+ LogCallback uri_log_callback;
/**
* Closure argument to uri_log_callback.
Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h 2009-02-02 22:24:04 UTC (rev
8172)
+++ libmicrohttpd/src/include/microhttpd.h 2009-02-03 03:29:21 UTC (rev
8173)
@@ -424,7 +424,7 @@
* if it was compiled without the "--enable-messages"
* flag being set.
*/
- MHD_OPTION_EXTERNAL_LOGGER = 13,
+ MHD_OPTION_EXTERNAL_LOGGER = 13
};
@@ -502,7 +502,7 @@
* We had to close the session since MHD was being
* shut down.
*/
- MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN = 3,
+ MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN = 3
};
@@ -518,7 +518,7 @@
MHD_GNUTLS_CIPHER_ARCFOUR_128,
MHD_GNUTLS_CIPHER_3DES_CBC,
MHD_GNUTLS_CIPHER_AES_128_CBC,
- MHD_GNUTLS_CIPHER_AES_256_CBC,
+ MHD_GNUTLS_CIPHER_AES_256_CBC
};
/**
@@ -552,7 +552,7 @@
*
* Takes no extra arguments.
*/
- MHD_CONNECTION_INFO_PROTOCOL,
+ MHD_CONNECTION_INFO_PROTOCOL
};
/**
Modified: libmicrohttpd/src/include/platform.h
===================================================================
--- libmicrohttpd/src/include/platform.h 2009-02-02 22:24:04 UTC (rev
8172)
+++ libmicrohttpd/src/include/platform.h 2009-02-03 03:29:21 UTC (rev
8173)
@@ -41,6 +41,7 @@
#define _OPEN_THREADS
#define _OPEN_SYS_SOCK_IPV6
#define _OPEN_MSGQ_EXT
+#define _LP64
#endif
#include <stdio.h>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8173 - in libmicrohttpd: . src/daemon src/include,
gnunet <=