[Box Backup-commit] COMMIT r1884 - box/trunk/lib/win32

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Wed, 17 Oct 2007 13:51:40 +0100


Author: chris
Date: 2007-10-17 13:51:40 +0100 (Wed, 17 Oct 2007)
New Revision: 1884

Modified:
   box/trunk/lib/win32/getopt_long.cxx
Log:
Fix compilation on MinGW. Not yet actually used on MinGW due to the
file extension, but it might be soon, if the default implementation
doesn't do what I want. (merges [1848])


Modified: box/trunk/lib/win32/getopt_long.cxx
===================================================================
--- box/trunk/lib/win32/getopt_long.cxx	2007-10-17 12:50:59 UTC (rev 1883)
+++ box/trunk/lib/win32/getopt_long.cxx	2007-10-17 12:51:40 UTC (rev 1884)
@@ -57,14 +57,17 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Box.h"
+// #include "Box.h"
 
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 
-#ifdef _MSC_VER
+#include "getopt.h"
+
+#if defined _MSC_VER || defined __MINGW32__
 #define	REPLACE_GETOPT		/* use this getopt as the system getopt(3) */
 #endif