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

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

diff --git a/src/mac/xpm/data.c b/src/mac/xpm/data.c
index b26f3eb112f04f34e0ff878889e7de4991dee5d5..cba30633ab76ecbf998af5647a44b2e07c0ac035 100644 (file)
--- a/src/mac/xpm/data.c
+++ b/src/mac/xpm/data.c
@@ -39,7 +39,7 @@ static char *RCS_Version = "$XpmVersion: 3.4k $";
 /* Internal version number */
 static char *RCS_Id = "$Id$";
 
-#include "xpmi.h"
+#include "XpmI.h"
 #endif
 #include <ctype.h>
 
@@ -423,7 +423,7 @@ xpmParseHeader(data)
            if (!l)
                return (XpmFileInvalid);
            buf[l] = '\0';
-           #ifdef macintosh
+           #if defined(macintosh) || defined(__APPLE__)
            ptr = strrchr(buf, '_');
            #else
            ptr = rindex(buf, '_');