// global variables
// ---------------------------------------------------------------------------
-WXDLLEXPORT_DATA(extern int) wxPageNumber;
+extern WXDLLEXPORT_DATA(int) wxPageNumber;
// ---------------------------------------------------------------------------
// wxDC is the device context - object on which any drawing is done
// now include the declaration of wxDC class
// ----------------------------------------------------------------------------
-#if defined(__PALMOS__)
+#if defined(__WXPALMOS__)
#include "wx/palmos/dc.h"
#elif defined(__WXMSW__)
#include "wx/msw/dc.h"