Remove redundant alloca define.

2001-09-28  Alex Graveley  <alex@ximian.com>

	* src/libsoup/soup-ntlm.c: Remove redundant alloca define.

	* src/libsoup/soup-socket.c (soup_socket_server_new): Use
	SOUP_SOCKET_CLOSE.

	* src/libsoup/soup-socket.h: Include winsock.h if windows.

diff --git a/ChangeLog b/ChangeLog
index b6c488e..7afd307 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-09-28  Alex Graveley  <alex@ximian.com>\r
+\r
+       * src/libsoup/soup-ntlm.c: Remove redundant alloca define.\r
+\r
+       * src/libsoup/soup-socket.c (soup_socket_server_new): Use \r
+       SOUP_SOCKET_CLOSE.\r
+\r
+       * src/libsoup/soup-socket.h: Include winsock.h if windows.\r
+\r
 2001-09-28  Alex Graveley  <alex@ximian.com>
 
        * src/libsoup/soup-socket-win.c: Fix copyright notice.

diff --git a/libsoup/soup-ntlm.c b/libsoup/soup-ntlm.c
index 25f3507..f4f6649 100644 (file)
--- a/libsoup/soup-ntlm.c
+++ b/libsoup/soup-ntlm.c
@@ -31,11 +31,6 @@
 #  endif
 #endif
 
-#ifdef SOUP_WIN32
-#include <malloc.h>
-#define alloca _alloca
-#endif
-
 #include <ctype.h>
 #include <string.h>
 

diff --git a/libsoup/soup-socket.c b/libsoup/soup-socket.c
index 948d616..d26c9bc 100644 (file)
--- a/libsoup/soup-socket.c
+++ b/libsoup/soup-socket.c
@@ -672,7 +672,7 @@ soup_socket_server_new (const gint port)
        return s;
 
  SETUP_ERROR:
-       close (s->sockfd);
+       SOUP_CLOSE_SOCKET (s->sockfd);
        g_free (s->addr);
        g_free (s);
        return NULL;

diff --git a/libsoup/soup-socket.h b/libsoup/soup-socket.h
index 9b242ff..dac4457 100644 (file)
--- a/libsoup/soup-socket.h
+++ b/libsoup/soup-socket.h
@@ -13,9 +13,16 @@
 
 #ifndef SOUP_SOCKET_H
 #define SOUP_SOCKET_H 1
-
+\r
+#ifdef HAVE_SYS_SOCKET_H\r
+#include <sys/socket.h>\r
+#endif\r
+\r
+#ifdef SOUP_WIN32\r
+#include <winsock.h>\r
+#endif\r
+\r
 #include <glib.h>
-#include <sys/socket.h>
 
 gboolean  soup_gethostbyname (const gchar         *hostname,
                              struct sockaddr_in  *sa,