WinRT: removed the "generic" + C++/CX hack-fix, now that a better fix is in official-SDL
authorDavid Ludwig <dludwig@pobox.com>
Sun, 21 Apr 2013 12:49:15 -0400
changeset 8465 be2dce468a8c
parent 8464 a2a909304cfe
child 8466 497894d5361e
WinRT: removed the "generic" + C++/CX hack-fix, now that a better fix is in official-SDL
include/begin_code.h
include/close_code.h
src/events/SDL_events.c
--- a/include/begin_code.h	Sun Apr 21 12:38:44 2013 -0400
+++ b/include/begin_code.h	Sun Apr 21 12:49:15 2013 -0400
@@ -148,8 +148,3 @@
 #endif
 #endif /* NULL */
 #endif /* ! Mac OS X - breaks precompiled headers */
-
-/* HACK: Make sure C++/CX works when compiling WinRT code */
-#if defined(__WINRT__)
-#define generic generic_
-#endif
--- a/include/close_code.h	Sun Apr 21 12:38:44 2013 -0400
+++ b/include/close_code.h	Sun Apr 21 12:49:15 2013 -0400
@@ -35,8 +35,3 @@
 #endif
 #pragma pack(pop)
 #endif /* Compiler needs structure packing set */
-
-/* Revert hack used to get C++/CX (WinRT) code compiling. */
-#if defined(__WINRT__)
-#undef generic
-#endif
--- a/src/events/SDL_events.c	Sun Apr 21 12:38:44 2013 -0400
+++ b/src/events/SDL_events.c	Sun Apr 21 12:49:15 2013 -0400
@@ -33,15 +33,6 @@
 #endif
 #include "../video/SDL_sysvideo.h"
 
-/* HACK: Make sure the 'generic' field in SDL_Event works on
-   WinRT, whereby 'generic' is redefined as 'generic_', in order to
-   allow SDL.h to be included in code compiled with Microsoft's
-   C++/CX extension.
-*/
-#if defined(__WINRT__)
-#define generic generic_
-#endif
-
 /* Public data -- the event filter */
 SDL_EventFilter SDL_EventOK = NULL;
 void *SDL_EventOKParam;