Cleanup

1 files changed, 51 insertions, 34 deletions

diff --git a/src/config-win32.h b/src/config-win32.h
index 307627f27..278af4818 100644
--- a/src/config-win32.h
+++ b/src/config-win32.h
@@ -1,27 +1,35 @@
-/* src/config-win32.h.  manually created to look like a config.h.  */
-/* Define if you have the stricmp function.  */
-#define HAVE_STRICMP 1
+#ifndef __SRC_CONFIG_WIN32_H
+#define __SRC_CONFIG_WIN32_H
 
-/* Define to 1 if you want the built-in manual */
-#define USE_MANUAL 1
+/* ================================================================ */
+/*    src/config-win32.h - Hand crafted config file for windows     */
+/* ================================================================ */
 
-/* Define cpu-machine-OS */
-#define OS "i386-pc-win32"
+/* ---------------------------------------------------------------- */
+/*                          HEADER FILES                            */
+/* ---------------------------------------------------------------- */
+
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
 
 /* Define if you have the <io.h> header file.  */
 #define HAVE_IO_H 1
 
-/* Define if you have the <limits.h> header file */
+/* Define if you have the <limits.h> header file.  */
 #define HAVE_LIMITS_H 1
 
-/* Define if you have the ftruncate function. */
-#define HAVE_FTRUNCATE 1
+/* Define if you have the <locale.h> header file.  */
+#define HAVE_LOCALE_H 1
 
-/* Define if you have the strdup function.  */
-#define HAVE_STRDUP 1
+/* Define if you have the <sys/utime.h> header file.  */
+#ifndef __BORLANDC__
+#define HAVE_SYS_UTIME_H 1
+#endif
 
-/* Define if you have the <fcntl.h> header file.  */
-#define HAVE_FCNTL_H 1
+/* Define if you have the <unistd.h> header file.  */
+#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__)
+#define HAVE_UNISTD_H 1
+#endif
 
 /* Define if you have the <windows.h> header file.  */
 #define HAVE_WINDOWS_H 1
@@ -35,33 +43,42 @@
 /* Define if you have the <ws2tcpip.h> header file.  */
 #define HAVE_WS2TCPIP_H 1
 
-/* Define if you have utime() */
-#if !defined(__BORLANDC__)
-#define HAVE_UTIME 1
-
-/* Define if you have the <sys/utime.h> header file */
-#define HAVE_SYS_UTIME_H 1
-#endif
+/* ---------------------------------------------------------------- */
+/*                             FUNCTIONS                            */
+/* ---------------------------------------------------------------- */
 
-/* Define if you have the <locale.h> header file */
-#define HAVE_LOCALE_H 1
+/* Define if you have the ftruncate function.  */
+#define HAVE_FTRUNCATE 1
 
-/* Define if you have the setlocale() function. */
+/* Define if you have the setlocale function.  */
 #define HAVE_SETLOCALE 1
 
-/* Defines set for VS2005 to _not_ decprecate a few functions we use. */
+/* Define if you have the strdup function.  */
+#define HAVE_STRDUP 1
+
+/* Define if you have the stricmp function.  */
+#define HAVE_STRICMP 1
+
+/* Define if you have the utime function */
+#ifndef __BORLANDC__
+#define HAVE_UTIME 1
+#endif
+
+/* ---------------------------------------------------------------- */
+/*                       ADDITIONAL DEFINITIONS                     */
+/* ---------------------------------------------------------------- */
+
+/* Defines set for VS2005 to _not_ deprecate a few functions we use. */
 #define _CRT_SECURE_NO_DEPRECATE
 #define _CRT_NONSTDC_NO_DEPRECATE
 
-/*************************************************
- * This section is for compiler specific defines.*
- *************************************************/
-/* Borland and MS don't have this */
-#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__)
+/* Define cpu-machine-OS */
+#ifndef OS
+#define OS "i386-pc-win32"
+#endif
 
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
+/* Define to 1 if you want the built-in manual */
+#define USE_MANUAL 1
 
-#else
 
-#endif
+#endif /* __SRC_CONFIG_WIN32_H */