Regenerate windows orconfig.h to match current autoheader generated orconfig.h

svn:r1743

1 files changed, 77 insertions, 34 deletions

diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index c51f427b4d..09a84282fb 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -1,8 +1,12 @@
-/* $Id$
- * orconfig.h  -- This file is *not* generated by autoconf.  Instead,
- * it has to be hand-edited to keep win32 happy. */
+/* $Id */
+/* orconfig.h for Windows -- This file is *not* generated by autoconf.
+ * Instead, it has to be hand-edited to keep Win32 happy.
+ */
+
+/* Windows-only defines. */
 #define MS_WINDOWS
 #define MS_WIN32
+#define CONFDIR ""
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
@@ -15,26 +19,30 @@
 
 /* Define to 1 if you have the <errno.h> header file. */
 #define HAVE_ERRNO_H
+
+/* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H
+
+/* Define to 1 if you have the `ftime' function. */
 #define HAVE_FTIME
+
+/* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
-#undef HAVE_STRPTIME
-#undef HAVE_INET_ATON
 
-/* Define to 1 if the system has the type `int16_t'. */
-#undef HAVE_INT16_T
+/* Define to 1 if you have the <grp.h> header file. */
+#undef HAVE_GRP_H
 
-/* Define to 1 if the system has the type `int32_t'. */
-#undef HAVE_INT32_T
+/* Define to 1 if you have the `inet_aton' function. */
+#undef HAVE_INET_ATON
 
-/* Define to 1 if the system has the type `int64_t'. */
-#undef HAVE_INT64_T
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H
 
-/* Define to 1 if the system has the type `int8_t'. */
-#undef HAVE_INT8_T
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H
 
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
+/* Define to 1 if you have the <machine/limits.h> header file. */
+#undef HAVE_MACHINE_LIMITS_H
 
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H
@@ -48,9 +56,15 @@
 /* Define to 1 if you have the <poll.h> header file. */
 #undef HAVE_POLL_H
 
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+
 /* Define to 1 if you have the <signal.h> header file. */
 #define HAVE_SIGNAL_H
 
+/* Define to 1 if you have the `socketpair' function. */
+#undef HAVE_SOCKETPAIR
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -63,12 +77,24 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H
 
+/* Define to 1 if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
+
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
+/* Define to 1 if you have the `strptime' function. */
+#undef HAVE_STRPTIME
+
 /* Define to 1 if you have the <sys/fcntl.h> header file. */
 #undef HAVE_SYS_FCNTL_H
 
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
 #undef HAVE_SYS_IOCTL_H
 
+/* Define to 1 if you have the <sys/limits.h> header file. */
+#undef HAVE_SYS_LIMITS_H
+
 /* Define to 1 if you have the <sys/poll.h> header file. */
 #undef HAVE_SYS_POLL_H
 
@@ -84,20 +110,14 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H
 
-/* Define to 1 if you have the <time.h> header file */
-#define HAVE_TIME_H
-
-/* Define to 1 if the system has the type `uint16_t'. */
-#undef HAVE_UINT16_T
-
-/* Define to 1 if the system has the type `uint32_t'. */
-#undef HAVE_UINT32_T
+/* Define to 1 if you have the <sys/wait.h> header file. */
+#undef HAVE_SYS_WAIT_H
 
-/* Define to 1 if the system has the type `uint64_t'. */
-#undef HAVE_UINT64_T
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H
 
-/* Define to 1 if the system has the type `uint8_t'. */
-#undef HAVE_UINT8_T
+/* Define to 1 if you have the `uname' function. */
+#undef HAVE_UNAME
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
@@ -105,7 +125,8 @@
 /* Name of package */
 #define PACKAGE "tor"
 
-/* Define to the address where bug reports for this package should be sent. */
+/* Def
+ine to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
 /* Define to the full name of this package. */
@@ -126,25 +147,47 @@
 /* The size of a `int', as computed by sizeof. */
 #define SIZEOF_INT 4
 
+/* The size of a `int16_t', as computed by sizeof. */
+#undef SIZEOF_INT16_T
+
+/* The size of a `int32_t', as computed by sizeof. */
+#undef SIZEOF_INT32_T
+
+/* The size of a `int64_t', as computed by sizeof. */
+#undef SIZEOF_INT64_T
+
+/* The size of a `int8_t', as computed by sizeof. */
+#undef SIZEOF_INT8_T
+
 /* The size of a `long', as computed by sizeof. */
 #define SIZEOF_LONG 4
 
 /* The size of a `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 0
+#undef SIZEOF_LONG_LONG
 
 /* The size of a `short', as computed by sizeof. */
 #define SIZEOF_SHORT 2
 
+/* The size of a `uint16_t', as computed by sizeof. */
+#undef SIZEOF_UINT16_T
+
+/* The size of a `uint32_t', as computed by sizeof. */
+#undef SIZEOF_UINT32_T
+
+/* The size of a `uint64_t', as computed by sizeof. */
+#undef SIZEOF_UINT64_T
+
+/* The size of a `uint8_t', as computed by sizeof. */
+#undef SIZEOF_UINT8_T
+
 /* The size of a `__int64', as computed by sizeof. */
 #define SIZEOF___INT64 8
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS
 
-#define HAVE_LIMITS_H
+/* Define to 1 iff unaligned int access is allowed */
+#define UNALIGNED_INT_ACCESS_OK
 
 /* Version number of package */
-#define VERSION "0.0.2pre26"
-
-/* XXXX WWWW */
-#define CONFDIR ""
+#define VERSION "0.0.6rc2"