[Cvs-cvs] Changes to ccvs/src/socket-client.h

[Derek Robert Price]

Index: ccvs/src/socket-client.h
diff -u ccvs/src/socket-client.h:1.6 ccvs/src/socket-client.h:1.7
--- ccvs/src/socket-client.h:1.6        Wed Jul 23 20:42:26 2003
+++ ccvs/src/socket-client.h    Sun Sep 25 00:28:51 2005
@@ -13,12 +13,7 @@
 #ifndef SOCKET_CLIENT_H__
 #define SOCKET_CLIENT_H__ 1
 
-#include <config.h>
-
-struct buffer *socket_buffer_initialize
-  (int, int, void (*) (struct buffer *));
-
-# if defined(AUTH_CLIENT_SUPPORT) || defined(HAVE_KERBEROS) || 
defined(HAVE_GSSAPI) || defined(SOCK_ERRNO) || defined(SOCK_STRERROR)
+# if defined SOCK_ERRNO || defined SOCK_STRERROR
 #   ifdef HAVE_WINSOCK_H
 #     include <winsock.h>
 #   else /* No winsock.h */
@@ -29,6 +24,9 @@
 #   endif /* No winsock.h */
 # endif
 
+struct buffer *socket_buffer_initialize
+  (int, int, void (*) (struct buffer *));
+
 /* If SOCK_ERRNO is defined, then send()/recv() and other socket calls
    do not set errno, but that this macro should be used to obtain an
    error code.  This probably doesn't make sense unless
@@ -43,15 +41,10 @@
 # ifndef SOCK_STRERROR
 #   define SOCK_STRERROR strerror
 
-#   if STDC_HEADERS
-#     include <string.h>
-#   endif
-
+#   include <string.h>
 #   ifndef strerror
 extern char *strerror (int);
 #   endif
 # endif /* ! SOCK_STRERROR */
-
-struct hostent *init_sockaddr (struct sockaddr_in *, char *, unsigned int);
 
 #endif /* SOCKET_CLIENT_H__ */