diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-02-07 15:34:45 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-02-07 15:34:45 +0000 |
commit | 96b1eb0d86d230b3be109ac1c6bc24b55fff1695 (patch) | |
tree | d80bd007b1e6daba43befdabd692757a7a625e7e /tools/bootstrp | |
parent | 2dc29c8cafba3c28ad15b0b953164b3d7e7a762c (diff) |
#65293#: fix static init.
Diffstat (limited to 'tools/bootstrp')
-rw-r--r-- | tools/bootstrp/rscdep.cxx | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx index 91cfcb248d3a..9993db82ade0 100644 --- a/tools/bootstrp/rscdep.cxx +++ b/tools/bootstrp/rscdep.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rscdep.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: vg $ $Date: 2002-01-29 14:58:33 $ + * last change: $Author: hr $ $Date: 2002-02-07 16:34:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,16 +67,6 @@ * ***************************************************************/ -#ifdef WNT -#define __STDC__ 1 -#include <string.h> -char *optarg = NULL; -int optind = 1; -int optopt = 0; -int opterr = 0; -#endif - - #ifdef UNX #include <unistd.h> #endif @@ -98,9 +88,6 @@ int opterr = 0; #include "cppdep.hxx" -/* Heiner Rechtien: poor man's getopt() */ -int simple_getopt(int argc, char *argv[], const char *optstring); - class RscHrcDep : public CppDep { public: @@ -124,7 +111,17 @@ void RscHrcDep::Execute() CppDep::Execute(); } -static String aDelim = DirEntry::GetAccessDelimiter(); +//static String aDelim; + +/* poor man's getopt() */ +int simple_getopt(int argc, char *argv[], const char *optstring); +#ifdef WNT +static char *optarg = NULL; +static int optind = 1; +static int optopt = 0; +static int opterr = 0; +#endif + int #ifdef WNT @@ -139,6 +136,7 @@ main( int argc, char **argv ) String aSrsBaseName; BOOL bSource = FALSE; ByteString aRespArg; + String aDelim = String(DirEntry::GetAccessDelimiter()); RscHrcDep *pDep = new RscHrcDep; |