Various Windows fixes

Submitted by:	Michihiro NAKAJIMA

SVN-Revision: 332

diff --git a/libarchive/test/test.h b/libarchive/test/test.h
index fbbf10a8c3d6b0db1f4915ec54649b90e9537d40..18011fcffe56fd1eadbee85a407d6627aa22ad49 100644 (file)
--- a/libarchive/test/test.h
+++ b/libarchive/test/test.h
@@ -45,7 +45,11 @@
 #error Oops: No config.h and no pre-built configuration in test.h.
 #endif
 
+#ifndef _WIN32
 #include <dirent.h>
+#else
+#include <direct.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -68,6 +72,25 @@
 #define        __FBSDID(a)     /* null */
 #endif
 
+#ifdef _WIN32
+extern char *optarg;
+extern int optind;
+extern int optopt;
+extern int opterr;
+extern int optreset;
+int getopt(int argc, char * const argv[], const char *optstring);
+#endif
+
+#ifdef _WIN32
+#define LOCALE_DE      "deu"
+#else
+#define LOCALE_DE      "de_DE.UTF-8"
+#endif
+
+#ifndef O_BINARY
+#define        O_BINARY 0
+#endif
+
 /*
  * Redefine DEFINE_TEST for use in defining the test functions.
  */