Compilation fix for !wxUSE_OWNER_DRAWN.

[wxWidgets.git] / src / expat / lib / internal.h

diff --git a/src/expat/lib/internal.h b/src/expat/lib/internal.h
index edcc7afce11799730fd54470bc428d8b84d31505..dd5454831da2b4e8f3a8406a2a7c72cc79c6539e 100644 (file)
--- a/src/expat/lib/internal.h
+++ b/src/expat/lib/internal.h
@@ -20,21 +20,20 @@
          and therefore subject to change.
 */
 
          and therefore subject to change.
 */
 

-#ifdef FASTCALL
-#undef FASTCALL
-#endif
+#if defined(__GNUC__) && defined(__i386__) && !defined(__MINGW32__)
+/* We'll use this version by default only where we know it helps.
+
+   regparm() generates warnings on Solaris boxes.   See SF bug #692878.

 
 

-#if defined(__GNUC__) && defined(__i386__)
-/* Instability reported with egcs on a RedHat Linux 7.3.
-   Let's comment it out:
+   Instability reported with egcs on a RedHat Linux 7.3.
+   Let's comment out:

    #define FASTCALL __attribute__((stdcall, regparm(3)))
    and let's try this:
 */
 #define FASTCALL __attribute__((regparm(3)))
    #define FASTCALL __attribute__((stdcall, regparm(3)))
    and let's try this:
 */
 #define FASTCALL __attribute__((regparm(3)))

-#define PTRCALL

 #define PTRFASTCALL __attribute__((regparm(3)))
 #define PTRFASTCALL __attribute__((regparm(3)))

+#endif

 
 

-#elif defined(WIN32)

 /* Using __fastcall seems to have an unexpected negative effect under
    MS VC++, especially for function pointers, so we won't use it for
    now on that platform. It may be reconsidered for a future release
 /* Using __fastcall seems to have an unexpected negative effect under
    MS VC++, especially for function pointers, so we won't use it for
    now on that platform. It may be reconsidered for a future release


@@ -42,11 +41,8 @@
    Likely reason: __fastcall on Windows is like stdcall, therefore
    the compiler cannot perform stack optimizations for call clusters.
 */
    Likely reason: __fastcall on Windows is like stdcall, therefore
    the compiler cannot perform stack optimizations for call clusters.
 */

-#define FASTCALL
-#define PTRCALL
-#define PTRFASTCALL

 
 

-#endif
+/* Make sure all of these are defined if they aren't already. */

 
 #ifndef FASTCALL
 #define FASTCALL
 
 #ifndef FASTCALL
 #define FASTCALL