include/SDL_stdinc.h
changeset 7191 75360622e65f
parent 7076 1666f7a7494e
child 7307 5d6b7b9432d3
     1.1 --- a/include/SDL_stdinc.h	Sat May 18 12:48:50 2013 -0700
     1.2 +++ b/include/SDL_stdinc.h	Sat May 18 14:17:52 2013 -0700
     1.3 @@ -21,7 +21,7 @@
     1.4  
     1.5  /**
     1.6   *  \file SDL_stdinc.h
     1.7 - *  
     1.8 + *
     1.9   *  This is a general header that includes C language support.
    1.10   */
    1.11  
    1.12 @@ -80,12 +80,12 @@
    1.13  /**
    1.14   *  The number of elements in an array.
    1.15   */
    1.16 -#define SDL_arraysize(array)	(sizeof(array)/sizeof(array[0]))
    1.17 -#define SDL_TABLESIZE(table)	SDL_arraysize(table)
    1.18 +#define SDL_arraysize(array)    (sizeof(array)/sizeof(array[0]))
    1.19 +#define SDL_TABLESIZE(table)    SDL_arraysize(table)
    1.20  
    1.21  /**
    1.22   *  \name Cast operators
    1.23 - *  
    1.24 + *
    1.25   *  Use proper C++ casts when compiled as C++ to be compatible with the option
    1.26   *  -Wold-style-cast of GCC (and -Werror=old-style-cast in GCC 4.2 and above).
    1.27   */
    1.28 @@ -179,7 +179,7 @@
    1.29  
    1.30  /** \cond */
    1.31  #ifndef DOXYGEN_SHOULD_IGNORE_THIS
    1.32 -#if !defined(__ANDROID__) 
    1.33 +#if !defined(__ANDROID__)
    1.34     /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */
    1.35  typedef enum
    1.36  {
    1.37 @@ -194,9 +194,7 @@
    1.38  #include "begin_code.h"
    1.39  /* Set up for C function definitions, even when using C++ */
    1.40  #ifdef __cplusplus
    1.41 -/* *INDENT-OFF* */
    1.42  extern "C" {
    1.43 -/* *INDENT-ON* */
    1.44  #endif
    1.45  
    1.46  #if defined(HAVE_ALLOCA) && !defined(alloca)
    1.47 @@ -758,10 +756,10 @@
    1.48  #endif
    1.49  
    1.50  /* The SDL implementation of iconv() returns these error codes */
    1.51 -#define SDL_ICONV_ERROR		(size_t)-1
    1.52 -#define SDL_ICONV_E2BIG		(size_t)-2
    1.53 -#define SDL_ICONV_EILSEQ	(size_t)-3
    1.54 -#define SDL_ICONV_EINVAL	(size_t)-4
    1.55 +#define SDL_ICONV_ERROR     (size_t)-1
    1.56 +#define SDL_ICONV_E2BIG     (size_t)-2
    1.57 +#define SDL_ICONV_EILSEQ    (size_t)-3
    1.58 +#define SDL_ICONV_EINVAL    (size_t)-4
    1.59  
    1.60  /* SDL_iconv_* are now always real symbols/types, not macros or inlined. */
    1.61  typedef struct _SDL_iconv_t *SDL_iconv_t;
    1.62 @@ -779,15 +777,13 @@
    1.63                                                 const char *fromcode,
    1.64                                                 const char *inbuf,
    1.65                                                 size_t inbytesleft);
    1.66 -#define SDL_iconv_utf8_locale(S)	SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1)
    1.67 -#define SDL_iconv_utf8_ucs2(S)		(Uint16 *)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", S, SDL_strlen(S)+1)
    1.68 -#define SDL_iconv_utf8_ucs4(S)		(Uint32 *)SDL_iconv_string("UCS-4-INTERNAL", "UTF-8", S, SDL_strlen(S)+1)
    1.69 +#define SDL_iconv_utf8_locale(S)    SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1)
    1.70 +#define SDL_iconv_utf8_ucs2(S)      (Uint16 *)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", S, SDL_strlen(S)+1)
    1.71 +#define SDL_iconv_utf8_ucs4(S)      (Uint32 *)SDL_iconv_string("UCS-4-INTERNAL", "UTF-8", S, SDL_strlen(S)+1)
    1.72  
    1.73  /* Ends C function definitions when using C++ */
    1.74  #ifdef __cplusplus
    1.75 -/* *INDENT-OFF* */
    1.76  }
    1.77 -/* *INDENT-ON* */
    1.78  #endif
    1.79  #include "close_code.h"
    1.80