mac changes : wxDC - removed doubly defined vars (inherited from base) and fixed...

[wxWidgets.git] / src / mac / xpm / RdFToBuf.c

diff --git a/src/mac/xpm/RdFToBuf.c b/src/mac/xpm/RdFToBuf.c
index 2745583cf04141134987b87dd2e72e99285aa1fb..abab09c787fc39a12f8ad795eaa5d144fede9ca0 100644 (file)
--- a/src/mac/xpm/RdFToBuf.c
+++ b/src/mac/xpm/RdFToBuf.c
@@ -37,18 +37,20 @@
  * HeDu (hedu@cul-ipn.uni-kiel.de) 4/94
  */
 
+#include "wx/setup.h"
+
 #ifdef macintosh
        #ifdef __std
                #undef __std
                #define __std()
        #endif
-       #include <unistd.h>
        #include <stat.h>
-       #include <fcntl.h>
        #include <unix.h>
+    #include <unistd.h>
+       #include <fcntl.h>
 #endif
 
-#include "xpmi.h"
+#include "XpmI.h"
 #ifndef macintosh
        #include <sys/stat.h>