Update SDL2 headers... oops

1 files changed, 31 insertions, 26 deletions

diff --git a/src/SDL2/include/SDL_rwops.h b/src/SDL2/include/SDL_rwops.h
index 1901a71b..0461ff78 100644
--- a/src/SDL2/include/SDL_rwops.h
+++ b/src/SDL2/include/SDL_rwops.h
@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -21,7 +21,7 @@
 
 /**
  *  \file SDL_rwops.h
- *  
+ *
  *  This file provides a general interface for SDL to read and write
  *  data streams.  It can easily be extended to files, memory, etc.
  */
@@ -35,11 +35,17 @@
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
-/* *INDENT-OFF* */
 extern "C" {
-/* *INDENT-ON* */
 #endif
 
+/* RWops Types */
+#define SDL_RWOPS_UNKNOWN   0   /* Unknown stream type */
+#define SDL_RWOPS_WINFILE   1   /* Win32 file */
+#define SDL_RWOPS_STDFILE   2   /* Stdio file */
+#define SDL_RWOPS_JNIFILE   3   /* Android asset */
+#define SDL_RWOPS_MEMORY    4   /* Memory stream */
+#define SDL_RWOPS_MEMORY_RO 5   /* Read-Only memory stream */
+
 /**
  * This is the read/write operation structure -- very basic.
  */
@@ -53,8 +59,8 @@ typedef struct SDL_RWops
     /**
      *  Seek to \c offset relative to \c whence, one of stdio's whence values:
      *  RW_SEEK_SET, RW_SEEK_CUR, RW_SEEK_END
-     *  
-     *  \return the final offset in the data stream.
+     *
+     *  \return the final offset in the data stream, or -1 on error.
      */
     Sint64 (SDLCALL * seek) (struct SDL_RWops * context, Sint64 offset,
                              int whence);
@@ -62,7 +68,7 @@ typedef struct SDL_RWops
     /**
      *  Read up to \c maxnum objects each of size \c size from the data
      *  stream to the area pointed at by \c ptr.
-     *  
+     *
      *  \return the number of objects read, or 0 at error or end of file.
      */
     size_t (SDLCALL * read) (struct SDL_RWops * context, void *ptr,
@@ -71,7 +77,7 @@ typedef struct SDL_RWops
     /**
      *  Write exactly \c num objects each of size \c size from the area
      *  pointed at by \c ptr to data stream.
-     *  
+     *
      *  \return the number of objects written, or 0 at error or end of file.
      */
     size_t (SDLCALL * write) (struct SDL_RWops * context, const void *ptr,
@@ -79,7 +85,7 @@ typedef struct SDL_RWops
 
     /**
      *  Close and free an allocated SDL_RWops structure.
-     *  
+     *
      *  \return 0 if successful or -1 on write error when flushing data.
      */
     int (SDLCALL * close) (struct SDL_RWops * context);
@@ -130,6 +136,7 @@ typedef struct SDL_RWops
         struct
         {
             void *data1;
+            void *data2;
         } unknown;
     } hidden;
 
@@ -138,7 +145,7 @@ typedef struct SDL_RWops
 
 /**
  *  \name RWFrom functions
- *  
+ *
  *  Functions to create SDL_RWops structures from various data streams.
  */
 /*@{*/
@@ -164,28 +171,28 @@ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromConstMem(const void *mem,
 extern DECLSPEC SDL_RWops *SDLCALL SDL_AllocRW(void);
 extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area);
 
-#define RW_SEEK_SET	0       /**< Seek from the beginning of data */
-#define RW_SEEK_CUR	1       /**< Seek relative to current read point */
-#define RW_SEEK_END	2       /**< Seek relative to the end of data */
+#define RW_SEEK_SET 0       /**< Seek from the beginning of data */
+#define RW_SEEK_CUR 1       /**< Seek relative to current read point */
+#define RW_SEEK_END 2       /**< Seek relative to the end of data */
 
 /**
  *  \name Read/write macros
- *  
+ *
  *  Macros to easily read and write from an SDL_RWops structure.
  */
 /*@{*/
-#define SDL_RWsize(ctx)	        (ctx)->size(ctx)
-#define SDL_RWseek(ctx, offset, whence)	(ctx)->seek(ctx, offset, whence)
-#define SDL_RWtell(ctx)			(ctx)->seek(ctx, 0, RW_SEEK_CUR)
-#define SDL_RWread(ctx, ptr, size, n)	(ctx)->read(ctx, ptr, size, n)
-#define SDL_RWwrite(ctx, ptr, size, n)	(ctx)->write(ctx, ptr, size, n)
-#define SDL_RWclose(ctx)		(ctx)->close(ctx)
+#define SDL_RWsize(ctx)         (ctx)->size(ctx)
+#define SDL_RWseek(ctx, offset, whence) (ctx)->seek(ctx, offset, whence)
+#define SDL_RWtell(ctx)         (ctx)->seek(ctx, 0, RW_SEEK_CUR)
+#define SDL_RWread(ctx, ptr, size, n)   (ctx)->read(ctx, ptr, size, n)
+#define SDL_RWwrite(ctx, ptr, size, n)  (ctx)->write(ctx, ptr, size, n)
+#define SDL_RWclose(ctx)        (ctx)->close(ctx)
 /*@}*//*Read/write macros*/
 
 
-/** 
+/**
  *  \name Read endian functions
- *  
+ *
  *  Read an item of the specified endianness and return in native format.
  */
 /*@{*/
@@ -198,9 +205,9 @@ extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src);
 extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src);
 /*@}*//*Read endian functions*/
 
-/** 
+/**
  *  \name Write endian functions
- *  
+ *
  *  Write an item of native format to the specified endianness.
  */
 /*@{*/
@@ -216,9 +223,7 @@ extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
-/* *INDENT-OFF* */
 }
-/* *INDENT-ON* */
 #endif
 #include "close_code.h"