浏览代码

.wikiheader-options: Treat SDL int types (Uint64, etc) as API prefixes.

This makes any reference to them in the docs link to their wiki pages.

Also fixup the integer type documentation, so the SDL2 wiki _has_ actual
pages for them.  :)
Ryan C. Gordon 9 月之前
父节点
当前提交
67b537cef4
共有 2 个文件被更改,包括 10 次插入9 次删除
  1. 1 1
      .wikiheaders-options
  2. 9 8
      include/SDL_stdinc.h

+ 1 - 1
.wikiheaders-options

@@ -3,7 +3,7 @@ projectshortname = SDL
 incsubdir = include
 incsubdir = include
 wikisubdir = SDL2
 wikisubdir = SDL2
 readmesubdir = docs
 readmesubdir = docs
-apiprefixregex = (SDL_|SDLK_|KMOD_|AUDIO_)
+apiprefixregex = (SDL_|SDLK_|KMOD_|AUDIO_|[US]int\d+)
 mainincludefname = SDL.h
 mainincludefname = SDL.h
 versionfname = include/SDL_version.h
 versionfname = include/SDL_version.h
 versionmajorregex = \A\#define\s+SDL_MAJOR_VERSION\s+(\d+)\Z
 versionmajorregex = \A\#define\s+SDL_MAJOR_VERSION\s+(\d+)\Z

+ 9 - 8
include/SDL_stdinc.h

@@ -193,58 +193,59 @@ typedef enum
 /**
 /**
  * A signed 8-bit integer type.
  * A signed 8-bit integer type.
  */
  */
+typedef int8_t Sint8;
 #define SDL_MAX_SINT8   ((Sint8)0x7F)           /* 127 */
 #define SDL_MAX_SINT8   ((Sint8)0x7F)           /* 127 */
 #define SDL_MIN_SINT8   ((Sint8)(~0x7F))        /* -128 */
 #define SDL_MIN_SINT8   ((Sint8)(~0x7F))        /* -128 */
-typedef int8_t Sint8;
 
 
 /**
 /**
  * An unsigned 8-bit integer type.
  * An unsigned 8-bit integer type.
  */
  */
+typedef uint8_t Uint8;
 #define SDL_MAX_UINT8   ((Uint8)0xFF)           /* 255 */
 #define SDL_MAX_UINT8   ((Uint8)0xFF)           /* 255 */
 #define SDL_MIN_UINT8   ((Uint8)0x00)           /* 0 */
 #define SDL_MIN_UINT8   ((Uint8)0x00)           /* 0 */
-typedef uint8_t Uint8;
 
 
 /**
 /**
  * A signed 16-bit integer type.
  * A signed 16-bit integer type.
  */
  */
+typedef int16_t Sint16;
 #define SDL_MAX_SINT16  ((Sint16)0x7FFF)        /* 32767 */
 #define SDL_MAX_SINT16  ((Sint16)0x7FFF)        /* 32767 */
 #define SDL_MIN_SINT16  ((Sint16)(~0x7FFF))     /* -32768 */
 #define SDL_MIN_SINT16  ((Sint16)(~0x7FFF))     /* -32768 */
-typedef int16_t Sint16;
 
 
 /**
 /**
  * An unsigned 16-bit integer type.
  * An unsigned 16-bit integer type.
  */
  */
+typedef uint16_t Uint16;
 #define SDL_MAX_UINT16  ((Uint16)0xFFFF)        /* 65535 */
 #define SDL_MAX_UINT16  ((Uint16)0xFFFF)        /* 65535 */
 #define SDL_MIN_UINT16  ((Uint16)0x0000)        /* 0 */
 #define SDL_MIN_UINT16  ((Uint16)0x0000)        /* 0 */
-typedef uint16_t Uint16;
 
 
 /**
 /**
  * A signed 32-bit integer type.
  * A signed 32-bit integer type.
  */
  */
+typedef int32_t Sint32;
 #define SDL_MAX_SINT32  ((Sint32)0x7FFFFFFF)    /* 2147483647 */
 #define SDL_MAX_SINT32  ((Sint32)0x7FFFFFFF)    /* 2147483647 */
 #define SDL_MIN_SINT32  ((Sint32)(~0x7FFFFFFF)) /* -2147483648 */
 #define SDL_MIN_SINT32  ((Sint32)(~0x7FFFFFFF)) /* -2147483648 */
-typedef int32_t Sint32;
 
 
 /**
 /**
  * An unsigned 32-bit integer type.
  * An unsigned 32-bit integer type.
  */
  */
+typedef uint32_t Uint32;
 #define SDL_MAX_UINT32  ((Uint32)0xFFFFFFFFu)   /* 4294967295 */
 #define SDL_MAX_UINT32  ((Uint32)0xFFFFFFFFu)   /* 4294967295 */
 #define SDL_MIN_UINT32  ((Uint32)0x00000000)    /* 0 */
 #define SDL_MIN_UINT32  ((Uint32)0x00000000)    /* 0 */
-typedef uint32_t Uint32;
 
 
 /**
 /**
  * A signed 64-bit integer type.
  * A signed 64-bit integer type.
  */
  */
+typedef int64_t Sint64;
 #define SDL_MAX_SINT64  ((Sint64)0x7FFFFFFFFFFFFFFFll)      /* 9223372036854775807 */
 #define SDL_MAX_SINT64  ((Sint64)0x7FFFFFFFFFFFFFFFll)      /* 9223372036854775807 */
 #define SDL_MIN_SINT64  ((Sint64)(~0x7FFFFFFFFFFFFFFFll))   /* -9223372036854775808 */
 #define SDL_MIN_SINT64  ((Sint64)(~0x7FFFFFFFFFFFFFFFll))   /* -9223372036854775808 */
-typedef int64_t Sint64;
 
 
 /**
 /**
  * An unsigned 64-bit integer type.
  * An unsigned 64-bit integer type.
  */
  */
+typedef uint64_t Uint64;
 #define SDL_MAX_UINT64  ((Uint64)0xFFFFFFFFFFFFFFFFull)     /* 18446744073709551615 */
 #define SDL_MAX_UINT64  ((Uint64)0xFFFFFFFFFFFFFFFFull)     /* 18446744073709551615 */
 #define SDL_MIN_UINT64  ((Uint64)(0x0000000000000000ull))   /* 0 */
 #define SDL_MIN_UINT64  ((Uint64)(0x0000000000000000ull))   /* 0 */
-typedef uint64_t Uint64;
+
 
 
 /* @} *//* Basic data types */
 /* @} *//* Basic data types */