WinRT: merged with SDL 2.0.1 codebase

1 files changed, 7 insertions, 6 deletions

diff --git a/src/file/SDL_rwops.c b/src/file/SDL_rwops.c
index 3a6f7db66f..73e9846aae 100644
--- a/src/file/SDL_rwops.c
+++ b/src/file/SDL_rwops.c
@@ -22,6 +22,11 @@
 #define _LARGEFILE64_SOURCE

 #include "SDL_config.h"

 

+#if defined(__WIN32__)

+#include "../core/windows/SDL_windows.h"

+#endif

+

+

 /* This file provides a general interface for SDL to read and write

    data sources.  It can easily be extended to files, memory, etc.

 */

@@ -42,8 +47,6 @@
 

 /* Functions to read/write Win32 API file pointers */

 

-#include "../core/windows/SDL_windows.h"

-

 #ifndef INVALID_SET_FILE_POINTER

 #define INVALID_SET_FILE_POINTER 0xFFFFFFFF

 #endif

@@ -275,10 +278,8 @@ windows_file_close(SDL_RWops * context)
             CloseHandle(context->hidden.windowsio.h);

             context->hidden.windowsio.h = INVALID_HANDLE_VALUE;   /* to be sure */

         }

-        if (context->hidden.windowsio.buffer.data) {

-            SDL_free(context->hidden.windowsio.buffer.data);

-            context->hidden.windowsio.buffer.data = NULL;

-        }

+        SDL_free(context->hidden.windowsio.buffer.data);

+        context->hidden.windowsio.buffer.data = NULL;

         SDL_FreeRW(context);

     }

     return (0);