From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 23 Apr 2001 23:34:07 +0000 (+0000)
Subject: fir for Sun CC 6.0 compilation of wxGTK
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4ea45e6ba3d47ef3f1a98d64a51149b7f004975f?ds=inline

fir for Sun CC 6.0 compilation of wxGTK


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index f3a7778e52..3b3444b4ab 100644
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -32,17 +32,25 @@
 #endif // PCH
 
 #ifdef __X__
-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#include <X11/Xlib.h>
-#ifdef __VMS__
-#pragma message enable nosimpint
-#endif
+    #ifdef __VMS__
+        #pragma message disable nosimpint
+    #endif
+
+    #include <X11/Xlib.h>
+
+    #ifdef __VMS__
+        #pragma message enable nosimpint
+    #endif
 
     #include "wx/utils.h"       // for wxGetDisplay()
 #elif defined(__WXGTK__)
-    #include "gdk/gdk.h"
+    // we have to declare struct tm to avoid problems with first forward
+    // declaring it in C code (glib.h included from gdk.h does it) and then
+    // defining it when time.h is included from the headers below - this is
+    // known not to work at least with Sun CC 6.01
+    #include <time.h>
+
+    #include <gdk/gdk.h>
 #endif
 
 #include "wx/fontutil.h"