fixing z/OS build issues

16 files changed, 60 insertions, 104 deletions

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index d850723b..5dcf875b 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = .
+
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/include \
 -I$(top_srcdir)/src/daemon \
@@ -20,33 +22,31 @@ EXTRA_DIST = SYMBOLS
 lib_LTLIBRARIES = \
   libmicrohttpd.la
 
-SUBDIRS =
-libmicrohttpd_la_LIBADD = 
-
 libmicrohttpd_la_SOURCES = \
 connection.c connection.h \
 reason_phrase.c reason_phrase.h \
 daemon.c  \
 internal.c internal.h \
 memorypool.c memorypool.h \
-plibc.h \
 postprocessor.c \
 response.c response.h
 libmicrohttpd_la_LDFLAGS = \
   -export-dynamic -version-info 4:3:0 $(retaincommand)
 
+
 if ENABLE_HTTPS
 SUBDIRS += https .
 libmicrohttpd_la_SOURCES += connection_https.c
-libmicrohttpd_la_LIBADD += \
-https/x509/libx509.la \
-https/lgl/liblgl.la \
-https/tls/libtls.la \
-https/minitasn1/libasn1.la \
-https/opencdk/libopencdk.la \
-https/openpgp/libopenpgp.la 
+libmicrohttpd_la_LIBADD = \
+  https/x509/libx509.la \
+  https/lgl/liblgl.la \
+  https/tls/libtls.la \
+  https/minitasn1/libasn1.la \
+  https/opencdk/libopencdk.la \
+  https/openpgp/libopenpgp.la 
 endif
- 
+
+
 check_PROGRAMS = \
   postprocessor_test \
   postprocessor_large_test \
diff --git a/src/daemon/connection.h b/src/daemon/connection.h
index bf78f390..29887d65 100644
--- a/src/daemon/connection.h
+++ b/src/daemon/connection.h
@@ -27,7 +27,7 @@
 #ifndef CONNECTION_H
 #define CONNECTION_H
 
-#include "config.h"
+#include "internal.h"
 
 /**
  * Obtain the select sets for this connection.
@@ -41,6 +41,7 @@ MHD_connection_get_fdset (struct MHD_Connection *connection,
                           fd_set * except_fd_set, int *max_fd);
 
 void MHD_set_http_calbacks (struct MHD_Connection *connection);
+
 #if HTTPS_SUPPORT
 void MHD_set_https_calbacks (struct MHD_Connection *connection);
 #endif
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index d6f3bc9c..965db0a6 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -30,7 +30,6 @@
 #include "memorypool.h"
 
 #if HTTPS_SUPPORT
-#include "gnutls.h"
 #include "gnutls_int.h"
 #include "gnutls_global.h"
 #endif
@@ -106,9 +105,9 @@ MHDS_init (struct MHD_Daemon *daemon)
     }
   else if (daemon->https_mem_cert && daemon->https_mem_key)
     {
-      key.data = daemon->https_mem_key;
+      key.data = (char*) daemon->https_mem_key;
       key.size = strlen (daemon->https_mem_key);
-      cert.data = daemon->https_mem_cert;
+      cert.data = (char*) daemon->https_mem_cert;
       cert.size = strlen (daemon->https_mem_cert);
 
       gnutls_certificate_set_x509_key_mem (daemon->x509_cret, &cert, &key,
@@ -701,7 +700,7 @@ MHD_select (struct MHD_Daemon *daemon, int may_block)
           ds = pos->socket_fd;
           if (ds != -1)
             {
-              // TODO call con->read handler
+              /* TODO call con->read handler */
               if (FD_ISSET (ds, &rs))
                 pos->read_handler (pos);
               if ((pos->socket_fd != -1) && (FD_ISSET (ds, &ws)))
diff --git a/src/daemon/https/Makefile.am b/src/daemon/https/Makefile.am
index 9ebb2043..bf9dbb1c 100644
--- a/src/daemon/https/Makefile.am
+++ b/src/daemon/https/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = minitasn1 lgl x509 tls
 if ENABLE_OPENPGP
 SUBDIRS += opencdk openpgp
 endif
-   
+
 #noinst_PROGRAMS = errcodes
 #errcodes_SOURCES = errcodes.c
 #errcodes_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS)
@@ -15,3 +15,5 @@ endif
 #       tls_test.c tests.h tests.c common.h common.c
 # certtool_SOURCES = certtool.gaa certtool-gaa.h certtool-cfg.h \
 # certtool-gaa.c certtool.c prime.c certtool-cfg.c
+
+EXTRA_DIST = gnutls.h
diff --git a/src/daemon/internal.h b/src/daemon/internal.h
index 4de5c6dd..0f1c39bd 100644
--- a/src/daemon/internal.h
+++ b/src/daemon/internal.h
@@ -27,30 +27,13 @@
 #ifndef INTERNAL_H
 #define INTERNAL_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <pthread.h>
-
-#include "config.h"
-#include "plibc.h"
+#include "platform.h"
 #include "microhttpd.h"
-
+#if HTTPS_SUPPORT
 #include "gnutls.h"
-
-#ifndef MINGW
-#include <sys/mman.h>
-#include <netdb.h>
-#include <netinet/in.h>
 #endif
 
 
-
 #define MHD_MAX(a,b) ((a)<(b)) ? (b) : (a)
 #define MHD_MIN(a,b) ((a)<(b)) ? (a) : (b)
 
@@ -484,9 +467,7 @@ struct MHD_Connection
      */
   enum MHD_CONNECTION_STATE state;
 
-  //enum MHDS_CONNECTION_STATE s_state;
-
-    /**
+     /**
      * HTTP response code.  Only valid if response object
      * is already set.
      */
@@ -550,7 +531,7 @@ struct MHD_Connection
 #endif
 };
 
-struct MHD_Daemon
+  n struct MHD_Daemon
 {
 
     /**
diff --git a/src/daemon/memorypool.c b/src/daemon/memorypool.c
index e58cab38..2e566fd8 100644
--- a/src/daemon/memorypool.c
+++ b/src/daemon/memorypool.c
@@ -22,13 +22,16 @@
  * @brief memory pool
  * @author Christian Grothoff
  */
-
 #include "memorypool.h"
 
 /* define MAP_ANONYMOUS for Mac OS X */
 #if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
 #define MAP_ANONYMOUS MAP_ANON
 #endif
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void*)-1)
+#endif
+
 
 struct MemoryPool
 {
@@ -72,8 +75,12 @@ MHD_pool_create (unsigned int max)
   pool = malloc (sizeof (struct MemoryPool));
   if (pool == NULL)
     return NULL;
+#ifdef MAP_ANONYMOUS
   pool->memory = MMAP (NULL, max, PROT_READ | PROT_WRITE,
                        MAP_ANONYMOUS, -1, 0);
+#else
+  pool->memory = MAP_FAILED;
+#endif
   if ((pool->memory == MAP_FAILED) || (pool->memory == NULL))
     {
       pool->memory = malloc (max);
diff --git a/src/examples/authorization_example.c b/src/examples/authorization_example.c
index 9c7185e5..8d661f25 100644
--- a/src/examples/authorization_example.c
+++ b/src/examples/authorization_example.c
@@ -23,14 +23,8 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "platform.h"
 #include <microhttpd.h>
-#include <stdlib.h>
-#ifndef MINGW
-#include <unistd.h>
-#endif
-#include <string.h>
-#include <stdio.h>
 
 #define PAGE "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
 
diff --git a/src/examples/fileserver_example.c b/src/examples/fileserver_example.c
index 139b606d..21e58d1f 100644
--- a/src/examples/fileserver_example.c
+++ b/src/examples/fileserver_example.c
@@ -23,16 +23,10 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "platform.h"
 #include <microhttpd.h>
-#include <stdlib.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#ifndef MINGW
 #include <unistd.h>
-#endif
-#include <string.h>
-#include <stdio.h>
 
 #define PAGE "<html><head><title>File not found</title></head><body>File not found</body></html>"
 
diff --git a/src/examples/fileserver_example_external_select.c b/src/examples/fileserver_example_external_select.c
index b4bdc91e..e3762abf 100644
--- a/src/examples/fileserver_example_external_select.c
+++ b/src/examples/fileserver_example_external_select.c
@@ -22,16 +22,10 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "platform.h"
 #include <microhttpd.h>
-#include <stdlib.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#ifndef MINGW
 #include <unistd.h>
-#endif
-#include <string.h>
-#include <stdio.h>
 
 #define PAGE "<html><head><title>File not found</title></head><body>File not found</body></html>"
 
diff --git a/src/examples/https_server_example.c b/src/examples/https_server_example.c
index 0763f36d..126b29d3 100644
--- a/src/examples/https_server_example.c
+++ b/src/examples/https_server_example.c
@@ -34,16 +34,10 @@
  * @author Sagie Amir
  */
 
-#include "config.h"
+#include "platform.h"
 #include <microhttpsd.h>
 #include <sys/stat.h>
 
-#include <stdlib.h>
-#ifndef MINGW
-#include <unistd.h>
-#endif
-#include <string.h>
-#include <stdio.h>
 #include "gnutls.h"
 #include <gcrypt.h>
 
diff --git a/src/examples/minimal_example.c b/src/examples/minimal_example.c
index 4bbbd94e..c65b4f89 100644
--- a/src/examples/minimal_example.c
+++ b/src/examples/minimal_example.c
@@ -22,14 +22,8 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "platform.h"
 #include <microhttpd.h>
-#include <stdlib.h>
-#ifndef MINGW
-#include <unistd.h>
-#endif
-#include <string.h>
-#include <stdio.h>
 
 #define PAGE "<html><head><title>libmicrohttpd demo</title></head><body>libmicrohttpd demo</body></html>"
 
diff --git a/src/examples/querystring_example.c b/src/examples/querystring_example.c
index 1e48c2ce..d3b53693 100644
--- a/src/examples/querystring_example.c
+++ b/src/examples/querystring_example.c
@@ -23,14 +23,8 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "platform.h"
 #include <microhttpd.h>
-#include <stdlib.h>
-#ifndef MINGW
-#include <unistd.h>
-#endif
-#include <string.h>
-#include <stdio.h>
 
 #define PAGE "<html><head><title>libmicrohttpd demo</title></head><body>Query string for &quot;%s&quot; was &quot;%s&quot;</body></html>"
 
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index c01b7979..f76fe3b0 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS = .
 include_HEADERS = microhttpd.h
+
+EXTRA_DIST = platform.h plibc.h
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 0e0f21b9..4351fbb2 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -58,6 +58,12 @@
  * All functions are guaranteed to be completely reentrant and
  * thread-safe.<p>
  *
+ * NEW: Before including "microhttpd.h" you should add the 
+ * necessary includes to define the "size_t", "fd_set", "socklen_t" and
+ * "struct sockaddr" data types (which headers are needed may
+ * depend on your platform; for possible suggestions consult
+ * "platform.h" in the MHD distribution).
+ *
  * TODO:
  * - Add option codes for SSL support
  */
@@ -65,14 +71,6 @@
 #ifndef MHD_MICROHTTPD_H
 #define MHD_MICROHTTPD_H
 
-#include <sys/types.h>
-#ifndef MINGW
-#include <sys/select.h>
-#include <sys/socket.h>
-#else
-#include "plibc.h"
-#endif
-
 #ifdef __cplusplus
 extern "C"
 {
@@ -84,7 +82,7 @@ extern "C"
 /**
  * Current version of the library.
  */
-#define MHD_VERSION 0x00030000
+#define MHD_VERSION 0x00040000
 
 /**
  * MHD-internal return codes.
@@ -283,7 +281,7 @@ enum MHD_FLAG
    * recommended to turn this ON if you are testing clients against
    * MHD, and OFF in production.
    */
-  MHD_USE_PEDANTIC_CHECKS = 32,
+  MHD_USE_PEDANTIC_CHECKS = 32
 
 };
 
@@ -410,7 +408,7 @@ enum MHD_OPTION
    */
   MHD_OPTION_TLS_COMP_ALGO,
 
-  MHD_HTTPS_OPTION_END,
+  MHD_HTTPS_OPTION_END
 };
 
 /**
@@ -454,7 +452,7 @@ enum MHD_ValueKind
   /**
    * HTTP footer (only for http 1.1 chunked encodings).
    */
-  MHD_FOOTER_KIND = 16,
+  MHD_FOOTER_KIND = 16
 
 };
 
@@ -488,7 +486,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
 
 };
 
diff --git a/src/include/microhttpsd.h b/src/include/microhttpsd.h
index cf85d3c6..cb7fb51b 100644
--- a/src/include/microhttpsd.h
+++ b/src/include/microhttpsd.h
@@ -54,7 +54,7 @@ typedef enum
   GNUTLS_KX_SRP,
   GNUTLS_KX_RSA_EXPORT,
   GNUTLS_KX_SRP_RSA,
-  GNUTLS_KX_SRP_DSS,
+  GNUTLS_KX_SRP_DSS
 } gnutls_kx_algorithm_t;
 
 typedef enum
@@ -72,7 +72,7 @@ typedef enum
   GNUTLS_MAC_NULL = 1,
   GNUTLS_MAC_MD5,
   GNUTLS_MAC_SHA1,
-  GNUTLS_MAC_SHA256,
+  GNUTLS_MAC_SHA256
   //GNUTLS_MAC_SHA384,
   //GNUTLS_MAC_SHA512
 } gnutls_mac_algorithm_t;
@@ -85,7 +85,7 @@ typedef enum
   GNUTLS_DIG_NULL = GNUTLS_MAC_NULL,
   GNUTLS_DIG_MD5 = GNUTLS_MAC_MD5,
   GNUTLS_DIG_SHA1 = GNUTLS_MAC_SHA1,
-  GNUTLS_DIG_SHA256 = GNUTLS_MAC_SHA256,
+  GNUTLS_DIG_SHA256 = GNUTLS_MAC_SHA256
 } gnutls_digest_algorithm_t;
 
 
@@ -119,7 +119,7 @@ typedef enum
 typedef enum
 {
   GNUTLS_PK_UNKNOWN = 0,
-  GNUTLS_PK_RSA = 1,
+  GNUTLS_PK_RSA = 1
   //GNUTLS_PK_DSA
 } gnutls_pk_algorithm_t;
 
@@ -144,7 +144,7 @@ enum MHD_InfoType
   MHD_INFO_MAC_ALGO,
   MHD_INFO_COMPRESSION_METHOD,
   MHD_INFO_PROTOCOL,
-  MHD_INFO_CERT_TYPE,
+  MHD_INFO_CERT_TYPE
 };
 
 union MHD_SessionInfo MHD_get_tls_session_info (struct MHD_Connection *con,
diff --git a/src/daemon/plibc.h b/src/include/plibc.h
index 8eafcc89..a939b0c8 100644
--- a/src/daemon/plibc.h
+++ b/src/include/plibc.h
@@ -438,7 +438,8 @@ extern "C"
 #define strcasecmp(a, b) stricmp(a, b)
 #define strncasecmp(a, b, c) strnicmp(a, b, c)
 
-#endif                          /* WINDOWS */
+#endif
+/* WINDOWS */
 
 #ifndef WINDOWS
 #define DIR_SEPARATOR '/'
@@ -589,6 +590,7 @@ extern "C"
 #endif
 
 
-#endif                          //_PLIBC_H_
+#endif
+//_PLIBC_H_
 
 /* end of plibc.h */