[Libreoffice-commits] .: vcl/win

[Tor Lillqvist]

 vcl/win/source/app/salinst.cxx |    2 --
 vcl/win/source/app/salshl.cxx  |    4 ----
 vcl/win/source/gdi/salgdi3.cxx |    5 -----
 3 files changed, 11 deletions(-)

New commits:
commit a4d77bafb6211481acd4e4b633639ec6bf3f25a3
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed May 9 13:45:58 2012 +0300

    This is Windows code so bin pointless #ifdef WNT
    
    Change-Id: I8e81ecd0e78f22f09db4288b781ae5f5da4d8760

diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index be70008..e80ff80 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -28,10 +28,8 @@
 
 
 #include <string.h>
-#ifdef WNT
 #include <svsys.h>
 #include <process.h>
-#endif
 
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 8e7c0b9..486ce04 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -37,8 +37,6 @@ SalShlData aSalShlData;
 
 // =======================================================================
 
-#ifdef WNT
-
 extern "C"
 {
 
@@ -73,8 +71,6 @@ BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved )
 
 }
 
-#endif
-
 // =======================================================================
 
 HCURSOR ImplLoadSalCursor( int nId )
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 79ff375..a22ab47 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1067,16 +1067,11 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont )
 static FILE * grLogFile = NULL;
 static FILE * grLog()
 {
-#ifdef WNT
     std::string logFileName(getenv("TEMP"));
     logFileName.append("\\grface.log");
     if (grLogFile == NULL) grLogFile = fopen(logFileName.c_str(),"w");
     else fflush(grLogFile);
     return grLogFile;
-#else
-    fflush(stdout);
-    return stdout;
-#endif
 }
 #undef NDEBUG
 #endif