zos fixes

5 files changed, 13 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index 416efbef..1712a724 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,16 +37,16 @@ AC_SUBST(LIB_VERSION_AGE)
 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_SUBST(PTHREAD_CPPFLAGS)
 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)
 
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index d29ce4aa..cf4d192e 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -882,7 +882,7 @@ MHD_start_daemon_va (unsigned int options,
           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
diff --git a/src/daemon/internal.h b/src/daemon/internal.h
index 5fa38984..969117fc 100644
--- a/src/daemon/internal.h
+++ b/src/daemon/internal.h
@@ -605,6 +605,8 @@ struct MHD_Connection
 #endif
 };
 
+typedef void * (*LogCallback)(void * cls, const char * uri);
+
 /**
  * State kept for each MHD daemon.
  */
@@ -656,7 +658,7 @@ struct MHD_Daemon
    * 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.
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 8b7960ea..29f73a36 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -424,7 +424,7 @@ enum MHD_OPTION
    * 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 @@ enum MHD_RequestTerminationCode
    * 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 @@ enum MHD_GNUTLS_CipherAlgorithm
   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 @@ enum MHD_ConnectionInfoType
    *
    * Takes no extra arguments.
    */
-  MHD_CONNECTION_INFO_PROTOCOL,
+  MHD_CONNECTION_INFO_PROTOCOL
 };
 
 /**
diff --git a/src/include/platform.h b/src/include/platform.h
index 857a0c10..1252487b 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -41,6 +41,7 @@
 #define _OPEN_THREADS
 #define _OPEN_SYS_SOCK_IPV6
 #define _OPEN_MSGQ_EXT
+#define _LP64
 #endif
 
 #include <stdio.h>