[GNUnet-SVN] r32792 - in libmicrohttpd/src: examples microhttpd testcurl testcurl/https

[gnunet]

Author: Karlson2k
Date: 2014-03-24 22:18:47 +0100 (Mon, 24 Mar 2014)
New Revision: 32792

Modified:
   libmicrohttpd/src/examples/fileserver_example_external_select.c
   libmicrohttpd/src/microhttpd/response.c
   libmicrohttpd/src/testcurl/https/test_https_time_out.c
   libmicrohttpd/src/testcurl/test_put.c
Log:
minor MHD_socket/int fixes

Modified: libmicrohttpd/src/examples/fileserver_example_external_select.c
===================================================================
--- libmicrohttpd/src/examples/fileserver_example_external_select.c     
2014-03-24 16:43:41 UTC (rev 32791)
+++ libmicrohttpd/src/examples/fileserver_example_external_select.c     
2014-03-24 21:18:47 UTC (rev 32792)
@@ -109,7 +109,7 @@
   fd_set rs;
   fd_set ws;
   fd_set es;
-  int max;
+  MHD_socket max;
   MHD_UNSIGNED_LONG_LONG mhd_timeout;
 
   if (argc != 3)

Modified: libmicrohttpd/src/microhttpd/response.c
===================================================================
--- libmicrohttpd/src/microhttpd/response.c     2014-03-24 16:43:41 UTC (rev 
32791)
+++ libmicrohttpd/src/microhttpd/response.c     2014-03-24 21:18:47 UTC (rev 
32792)
@@ -241,7 +241,7 @@
   if (NULL == (response = malloc (sizeof (struct MHD_Response) + block_size)))
     return NULL;
   memset (response, 0, sizeof (struct MHD_Response));
-  response->fd = MHD_INVALID_SOCKET;
+  response->fd = -1;
   response->data = (void *) &response[1];
   response->data_buffer_size = block_size;
   if (0 != pthread_mutex_init (&response->mutex, NULL))
@@ -296,7 +296,7 @@
   struct MHD_Response *response = cls;
 
   (void) close (response->fd);
-  response->fd = MHD_INVALID_SOCKET;
+  response->fd = -1;
 }
 
 
@@ -380,7 +380,7 @@
   if (NULL == (response = malloc (sizeof (struct MHD_Response))))
     return NULL;
   memset (response, 0, sizeof (struct MHD_Response));
-  response->fd = MHD_INVALID_SOCKET;
+  response->fd = -1;
   if (0 != pthread_mutex_init (&response->mutex, NULL))
     {
       free (response);

Modified: libmicrohttpd/src/testcurl/https/test_https_time_out.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_time_out.c      2014-03-24 
16:43:41 UTC (rev 32791)
+++ libmicrohttpd/src/testcurl/https/test_https_time_out.c      2014-03-24 
21:18:47 UTC (rev 32792)
@@ -62,7 +62,7 @@
   sa.sin_port = htons (DEAMON_TEST_PORT);
   sa.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) (long) sd);
+  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
 
   ret = connect (sd, &sa, sizeof (struct sockaddr_in));
 

Modified: libmicrohttpd/src/testcurl/test_put.c
===================================================================
--- libmicrohttpd/src/testcurl/test_put.c       2014-03-24 16:43:41 UTC (rev 
32791)
+++ libmicrohttpd/src/testcurl/test_put.c       2014-03-24 21:18:47 UTC (rev 
32792)
@@ -301,7 +301,7 @@
   fd_set rs;
   fd_set ws;
   fd_set es;
-  int max;
+  MHD_socket max;
   int running;
   struct CURLMsg *msg;
   time_t start;