From d6c5d24af3627ec12721e7d286d426ed12901b55 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sun, 18 Dec 2005 15:36:14 +0000
Subject: Cleanup windows header includes. Where aplicable, inclusion of
 windows.h winsock.h winsock2.h ws2tcpip.h is done in setup.h

---
 src/homedir.c | 3 ---
 src/main.c    | 8 ++------
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/homedir.c b/src/homedir.c
index e9b6db3be..f27aa6924 100644
--- a/src/homedir.c
+++ b/src/homedir.c
@@ -27,9 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef WIN32
-#include <windows.h>
-#endif
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
diff --git a/src/main.c b/src/main.c
index a9a0c30fc..51e3413fb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -47,10 +47,6 @@
 
 #define CURLseparator   "--_curl_--"
 
-#if defined(WIN32)&&!defined(__CYGWIN32__)
-#include <winsock2.h>
-#endif
-
 #ifdef __NOVELL_LIBC__
 #include <screen.h>
 #endif
@@ -2380,7 +2376,7 @@ static void parseconfig(const char *filename,
         }
         else {
           /* Get the filename of our executable. GetModuleFileName is
-           * defined in windows.h, which is #included into libcurl.
+           * already declared via inclusions done in setup header file.
            * We assume that we are using the ASCII version here.
            */
           int n = GetModuleFileName(0, filebuffer, sizeof(filebuffer));
@@ -3114,7 +3110,7 @@ static void free_config_fields(struct Configurable *config)
 #if defined(WIN32) && !defined(__CYGWIN32__)
 
 /* Function to find CACert bundle on a Win32 platform using SearchPath.
- * (SearchPath is defined in windows.h, which is #included into libcurl)
+ * (SearchPath is already declared via inclusions done in setup header file)
  * (Use the ASCII version instead of the unicode one!)
  * The order of the directories it searches is:
  *  1. application's directory
-- 
cgit v1.2.3