removed duplicated friend declaration

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

diff --git a/src/mac/xpm/parse.c b/src/mac/xpm/parse.c
index c7716897b84fd1aa1039c6e508d86f7222e94861..fdf19f342060c21761e2dabe1f6b7abb21bc76a1 100644 (file)
--- a/src/mac/xpm/parse.c
+++ b/src/mac/xpm/parse.c
@@ -38,7 +38,7 @@
  * HeDu (hedu@cul-ipn.uni-kiel.de) 4/94
  */
 
-#include "xpmi.h"
+#include "XpmI.h"
 #include <ctype.h>
 
 LFUNC(ParsePixels, int, (xpmData *data, unsigned int width,
@@ -111,7 +111,8 @@ xpmParseValues(data, width, height, ncolors, cpp,
            ptr = buf;
            got_one = False;
            while (!got_one) {
-           #ifdef macintosh // we have a strange parameter problem here
+           #if defined(macintosh) || defined(__APPLE__)
+           // we have a strange parameter problem here
                ptr = strchr(ptr, '_'); // index
            #else
                ptr = index(ptr, '_');