mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 06:28:55 +02:00
b0e932557c
* As per our mailing list discussion, package management will support multiple versions of the same package being installed at the same time, so this *should* work like this in theory. * Adjust patch to match 1:1 SDL changes accepted upstream.
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
diff -Naur SDL2-2.0.0/include/begin_code.h SDL2-2.0.0-haiku/include/begin_code.h
|
|
--- SDL2-2.0.0/include/begin_code.h 2013-08-11 21:57:54.011796480 -0500
|
|
+++ SDL2-2.0.0-haiku/include/begin_code.h 2013-08-19 15:12:06.654049280 -0500
|
|
@@ -35,13 +35,7 @@
|
|
|
|
/* Some compilers use a special export keyword */
|
|
#ifndef DECLSPEC
|
|
-# if defined(__BEOS__) || defined(__HAIKU__)
|
|
-# if defined(__GNUC__)
|
|
-# define DECLSPEC __declspec(dllexport)
|
|
-# else
|
|
-# define DECLSPEC __declspec(export)
|
|
-# endif
|
|
-# elif defined(__WIN32__)
|
|
+# if defined(__WIN32__)
|
|
# ifdef __BORLANDC__
|
|
# ifdef BUILD_SDL
|
|
# define DECLSPEC
|
|
@@ -54,6 +48,8 @@
|
|
# else
|
|
# if defined(__GNUC__) && __GNUC__ >= 4
|
|
# define DECLSPEC __attribute__ ((visibility("default")))
|
|
+# elif defined(__GNUC__) && __GNUC__ >= 2
|
|
+# define DECLSPEC __declspec(dllexport)
|
|
# else
|
|
# define DECLSPEC
|
|
# endif
|
|
diff -Naur SDL2-2.0.0/src/main/beos/SDL_BApp.h SDL2-2.0.0-haiku/src/main/beos/SDL_BApp.h
|
|
--- SDL2-2.0.0/src/main/beos/SDL_BApp.h 2013-08-11 21:57:54.058982400 -0500
|
|
+++ SDL2-2.0.0-haiku/src/main/beos/SDL_BApp.h 2013-08-19 15:10:50.412876800 -0500
|
|
@@ -371,7 +371,7 @@
|
|
|
|
|
|
/* Members */
|
|
- vector<SDL_Window*> _window_map; /* Keeps track of SDL_Windows by index-id*/
|
|
+ std::vector<SDL_Window*> _window_map; /* Keeps track of SDL_Windows by index-id*/
|
|
|
|
display_mode *_saved_mode;
|
|
BGLView *_current_context;
|