X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common.h;h=c3c03bab27bf8e4a9dd4ae3a8ed41df47adbdf5e;hb=eac69717338922e6bb55076e57d7674080291fe9;hp=b58228b83dcd4e291b8abd8bf79279b60a20104c;hpb=4742480dcabcbd9d23fd8cb9a655fc8c9c314513;p=gpsp.git diff --git a/common.h b/common.h index b58228b..c3c03ba 100644 --- a/common.h +++ b/common.h @@ -114,8 +114,8 @@ typedef signed char s8; typedef unsigned short int u16; typedef signed short int s16; - typedef unsigned long u32; - typedef signed long s32; + typedef unsigned int u32; + typedef signed int s32; typedef unsigned long long int u64; typedef signed long long int s64; @@ -135,8 +135,8 @@ #define file_close(filename_tag) \ { \ - sync(); \ fclose(filename_tag); \ + sync(); \ } \ #else @@ -157,30 +157,6 @@ #define file_tag_type FILE * - // The ARM arch uses SDL, and SDL requires you to know what resolution - // you want. Define the resolution for ARM arch builds here. - // Placed in common.h for use with video.c and gui.c. - - #ifndef PC_BUILD - - #define GP2X_SCREEN_WIDTH 320 - #define GP2X_SCREEN_HEIGHT 240 - - #define GIZ_SCREEN_WIDTH 320 - #define GIZ_SCREEN_HEIGHT 240 - - #ifdef GP2X_BUILD - #define SDL_SCREEN_WIDTH GP2X_SCREEN_WIDTH - #define SDL_SCREEN_HEIGHT GP2X_SCREEN_HEIGHT - - #elif defined(GIZ_BUILD) - - #define SDL_SCREEN_WIDTH GIZ_SCREEN_WIDTH - #define SDL_SCREEN_HEIGHT GIZ_SCREEN_HEIGHT - #endif - - #endif - #endif // These must be variables, not constants.