We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] SDL2 patch for better VS2005 compatibility

SDL2.MSVC2005.patch (text/plain), 1.74 KB, created by Ozkan Sezer on 2015-03-01 17:45:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ozkan Sezer

Created: 2015-03-01 17:45:11 UTC

Size: 1.74 KB

patch

obsolete

># make SDL2 to compile using MS Visual Studio 2005
>
>--- SDL2/src/stdlib/SDL_stdlib.c
>+++ SDL2src/src/stdlib/SDL_stdlib.c
>@@ -279,7 +279,8 @@ __declspec(selectany) int _fltused = 1;
> #endif
> 
> /* The optimizer on Visual Studio 2010/2012 generates memcpy() calls */
>-#if _MSC_VER >= 1600 && defined(_WIN64) && !defined(_DEBUG)
>+/* Visual Studio 2005 does it too, and it also generates memset() calls */
>+#if (_MSC_VER == 1400 || _MSC_VER >= 1600) && defined(_WIN64) && !defined(_DEBUG)
> #include <intrin.h>
> 
> #pragma function(memcpy)
>--- SDL2/src/video/SDL_pixels.c
>+++ SDL2src/src/video/SDL_pixels.c
>@@ -1101,9 +1101,7 @@ SDL_CalculateGammaRamp(float gamma, Uint
> 
>     /* 0.0 gamma is all black */
>     if (gamma == 0.0f) {
>-        for (i = 0; i < 256; ++i) {
>-            ramp[i] = 0;
>-        }
>+        SDL_memset(ramp, 0, 256 * sizeof(Uint16));
>         return;
>     } else if (gamma == 1.0f) {
>         /* 1.0 gamma is identity */
>--- SDL2/src/video/windows/SDL_windowsvideo.h
>+++ SDL2src/src/video/windows/SDL_windowsvideo.h
>@@ -27,7 +27,7 @@
> 
> #include "../SDL_sysvideo.h"
> 
>-#if defined(_MSC_VER)
>+#if defined(_MSC_VER) && (_MSC_VER >= 1500)
> #include <msctf.h>
> #else
> #include "SDL_msctf.h"
>--- SDL2/src/video/windows/SDL_windowskeyboard.c
>+++ SDL2src/src/video/windows/SDL_windowskeyboard.c
>@@ -211,7 +211,12 @@ void IME_Present(SDL_VideoData *videodat
> 
> #else
> 
>-#ifdef __GNUC__
>+#ifdef _SDL_msctf_h
>+#define USE_INIT_GUID
>+#elif defined(__GNUC__)
>+#define USE_INIT_GUID
>+#endif
>+#ifdef USE_INIT_GUID
> #undef DEFINE_GUID
> #define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) static const GUID n = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
> DEFINE_GUID(IID_ITfInputProcessorProfileActivationSink,        0x71C6E74E,0x0F28,0x11D8,0xA8,0x2A,0x00,0x06,0x5B,0x84,0x43,0x5C);
>

Actions: View | Diff

Attachments on bug 2896: 2056

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.