summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-06-17 11:30:15 +0200
committerMathias Bauer <mba@openoffice.org>2010-06-17 11:30:15 +0200
commitda4a9fc94efc66b5acc95bbd6a6bb376ad01eea6 (patch)
tree121c572cf5c9014c5b56c6f710533d8b5f6ffb2e
parentba53ef2077b89a00987b9f06cc2bd31d88c9d916 (diff)
CWS systemlibc: #i69033#: one more fix for mingw
-rw-r--r--tools/bootstrp/makefile.mk4
-rw-r--r--tools/bootstrp/rscdep.cxx6
2 files changed, 9 insertions, 1 deletions
diff --git a/tools/bootstrp/makefile.mk b/tools/bootstrp/makefile.mk
index 8338d35d1021..41188d2117d0 100644
--- a/tools/bootstrp/makefile.mk
+++ b/tools/bootstrp/makefile.mk
@@ -38,6 +38,10 @@ LIBTARGET=NO
CDEFS+=-D_TOOLS_STRINGLIST
+.IF "$(HAVE_GETOPT)" == "YES"
+CDEFS += -DHAVE_GETOPT
+.ENDIF
+
# --- Files --------------------------------------------------------
OBJFILES= \
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index 0d39794b8476..37edfc6a8c18 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.cxx
@@ -45,10 +45,14 @@
#include "cppdep.hxx"
-#ifdef WNT
+#if defined WNT
+#if !defined HAVE_GETOPT
#define __STDC__ 1
#define __GNU_LIBRARY__
#include <external/glibc/getopt.h>
+#else
+#include <getopt.h>
+#endif
#endif
class RscHrcDep : public CppDep