Kaydet (Commit) a4d77baf authored tarafından Tor Lillqvist's avatar Tor Lillqvist

This is Windows code so bin pointless #ifdef WNT

Change-Id: I8e81ecd0e78f22f09db4288b781ae5f5da4d8760
üst 96f79ea7
...@@ -28,10 +28,8 @@ ...@@ -28,10 +28,8 @@
#include <string.h> #include <string.h>
#ifdef WNT
#include <svsys.h> #include <svsys.h>
#include <process.h> #include <process.h>
#endif
#include <osl/file.hxx> #include <osl/file.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
......
...@@ -37,8 +37,6 @@ SalShlData aSalShlData; ...@@ -37,8 +37,6 @@ SalShlData aSalShlData;
// ======================================================================= // =======================================================================
#ifdef WNT
extern "C" extern "C"
{ {
...@@ -73,8 +71,6 @@ BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) ...@@ -73,8 +71,6 @@ BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved )
} }
#endif
// ======================================================================= // =======================================================================
HCURSOR ImplLoadSalCursor( int nId ) HCURSOR ImplLoadSalCursor( int nId )
......
...@@ -1067,16 +1067,11 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) ...@@ -1067,16 +1067,11 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont )
static FILE * grLogFile = NULL; static FILE * grLogFile = NULL;
static FILE * grLog() static FILE * grLog()
{ {
#ifdef WNT
std::string logFileName(getenv("TEMP")); std::string logFileName(getenv("TEMP"));
logFileName.append("\\grface.log"); logFileName.append("\\grface.log");
if (grLogFile == NULL) grLogFile = fopen(logFileName.c_str(),"w"); if (grLogFile == NULL) grLogFile = fopen(logFileName.c_str(),"w");
else fflush(grLogFile); else fflush(grLogFile);
return grLogFile; return grLogFile;
#else
fflush(stdout);
return stdout;
#endif
} }
#undef NDEBUG #undef NDEBUG
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment