[Libreoffice-commits] .: tools/bootstrp tools/Executable_rscdep.mk

[Matus Kukan]

 tools/Executable_rscdep.mk |    6 ------
 tools/bootstrp/rscdep.cxx  |    4 ----
 2 files changed, 10 deletions(-)

New commits:
commit 40775ce183ac29e9598cbca59e995c7e77327a1a
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Apr 12 22:07:11 2012 +0200

    HAVE_GETOPT is always NO for windows

diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 2117162..a353b8d 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -57,15 +57,9 @@ $(eval $(call gb_Executable_add_exception_objects,rscdep,\
 ))
 
 ifeq ($(OS),WNT)
-ifeq ($(HAVE_GETOPT),YES)
-$(eval $(call gb_Executable_add_defs,rscdep,\
-    -DHAVE_GETOPT \
-))
-else
 $(eval $(call gb_Executable_use_libraries,rscdep,\
     gnu_getopt \
 ))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index f10448d..269086b 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.cxx
@@ -44,13 +44,9 @@
 #include "cppdep.hxx"
 
 #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