X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common.h;h=c3c03bab27bf8e4a9dd4ae3a8ed41df47adbdf5e;hb=eac69717338922e6bb55076e57d7674080291fe9;hp=f111348db3286fca692f5f3683c0f131d3a4bd50;hpb=2823a4c8196a02da86ee180cf55586d4e8c91a2f;p=gpsp.git diff --git a/common.h b/common.h index f111348..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. @@ -268,8 +244,6 @@ typedef u32 fixed16_16; #define vprintf(format, ap) \ vfprintf(stderr, format, ap) \ - void gp2x_overclock(void); - // #define STDIO_DEBUG #endif