Corrected case mismatches in #include file names and #ifdef'd out Windows specific code

5 files changed, 21 insertions, 16 deletions

diff --git a/soltools/testSHL/makefile.mk b/soltools/testSHL/makefile.mk
index 1a238a7d1f8f..afa3645fbf24 100644
--- a/soltools/testSHL/makefile.mk
+++ b/soltools/testSHL/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: sz $ $Date: 2001-04-12 10:55:57 $
+#   last change: $Author: pluby $ $Date: 2001-04-18 14:48:35 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -80,7 +80,7 @@ APP1OBJS=   $(OBJ)$/$(TARGET).obj
 APP1STDLIBS=$(SALLIB)\
             $(SALHELPERLIB)
 APP1DEPN= $(LB)$/tstutil.lib
-APP1LIBS= $(LB)$/tstutil.lib \
+APP1LIBS= $(LB)$/tstutil.lib
 
 # --- Targets ------------------------------------------------------
 
diff --git a/soltools/testSHL/testshl.cxx b/soltools/testSHL/testshl.cxx
index 1c5094a7544d..f2815003ed06 100644
--- a/soltools/testSHL/testshl.cxx
+++ b/soltools/testSHL/testshl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testshl.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: sz $ $Date: 2001-04-12 10:55:57 $
+ *  last change: $Author: pluby $ $Date: 2001-04-18 14:48:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,7 +66,7 @@
 #endif
 
 #ifndef _SOLTOOLS_TESTSHL_TSTMGR_HXX_
-#include "inc/tstmgr.hxx"
+#include "inc/tstMgr.hxx"
 #endif
 
 using namespace tstutl;
diff --git a/soltools/testSHL/util/makefile.mk b/soltools/testSHL/util/makefile.mk
index af2d0f772754..787058cce210 100644
--- a/soltools/testSHL/util/makefile.mk
+++ b/soltools/testSHL/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: sz $ $Date: 2001-04-12 10:54:54 $
+#   last change: $Author: pluby $ $Date: 2001-04-18 14:48:35 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -75,7 +75,7 @@ TARGET=tstutil
 OBJFILES =\
                 $(OBJ)$/tlog.obj  \
                 $(OBJ)$/tutil.obj \
-                $(OBJ)$/tstmgr.obj
+                $(OBJ)$/tstMgr.obj
 
 # --- Targets ------------------------------------------------------
 
diff --git a/soltools/testSHL/util/tstMgr.cxx b/soltools/testSHL/util/tstMgr.cxx
index 5a478370020d..7ec7d2751994 100644
--- a/soltools/testSHL/util/tstMgr.cxx
+++ b/soltools/testSHL/util/tstMgr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tstMgr.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: sz $ $Date: 2001-04-12 10:54:54 $
+ *  last change: $Author: pluby $ $Date: 2001-04-18 14:48:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,7 +58,7 @@
  *
  *
  ************************************************************************/
-#include "tstmgr.hxx"
+#include "tstMgr.hxx"
 
 #ifndef _OSL_MODULE_HXX_
 #include <osl/module.hxx>
diff --git a/soltools/testSHL/util/tutil.cxx b/soltools/testSHL/util/tutil.cxx
index e88a866a9d43..cf1d278cd292 100644
--- a/soltools/testSHL/util/tutil.cxx
+++ b/soltools/testSHL/util/tutil.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tutil.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: sz $ $Date: 2001-04-12 10:54:54 $
+ *  last change: $Author: pluby $ $Date: 2001-04-18 14:48:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,8 +63,13 @@
 // <namespace_tstutl>
 namespace tstutl {
 
-// _getcwd hack is deprecated as soon as normalizePath works as intend
+// getcwd hack is deprecated as soon as normalizePath works as intend
+#ifdef WNT
+#define _getcwd getcwd
 #include <direct.h>                         // _getcwd
+#else
+#include <stdlib.h>                         // getcwd
+#endif
 
 // <function_cnvrtPth>
 ::rtl::OUString cnvrtPth( ::rtl::OString sysPth ) {
@@ -81,7 +86,7 @@ namespace tstutl {
 
         // <hack> for osl_normalizePath() can't handle relatives
             char buffer[256];
-            OString curPth(_getcwd(buffer,256));
+            OString curPth(getcwd(buffer,256));
         // </hack>
         OUString nrmCurPth;
         FileBase::normalizePath( OUString::createFromAscii( curPth ) ,