Mercurial > mplayer.hg
diff loader/win32.c @ 25794:2c8cdb9123b8
Fix a ton of illegal identifiers. Identifiers starting with __ or _ and a
capital letter are reserved for the system, those starting with _ are
reserved at the file level.
author | diego |
---|---|
date | Sun, 20 Jan 2008 17:16:39 +0000 |
parents | dc3406eef251 |
children | 953318dc3c7c |
line wrap: on
line diff
--- a/loader/win32.c Sun Jan 20 17:03:35 2008 +0000 +++ b/loader/win32.c Sun Jan 20 17:16:39 2008 +0000 @@ -2800,16 +2800,16 @@ return 0; } -unsigned int _GetPrivateProfileIntA(const char* appname, const char* keyname, INT default_value, const char* filename) +unsigned int GetPrivateProfileIntA_(const char* appname, const char* keyname, INT default_value, const char* filename) { return expGetPrivateProfileIntA(appname, keyname, default_value, filename); } -int _GetPrivateProfileStringA(const char* appname, const char* keyname, +int GetPrivateProfileStringA_(const char* appname, const char* keyname, const char* def_val, char* dest, unsigned int len, const char* filename) { return expGetPrivateProfileStringA(appname, keyname, def_val, dest, len, filename); } -int _WritePrivateProfileStringA(const char* appname, const char* keyname, +int WritePrivateProfileStringA_(const char* appname, const char* keyname, const char* string, const char* filename) { return expWritePrivateProfileStringA(appname, keyname, string, filename); @@ -2817,9 +2817,9 @@ -static int WINAPI expDefDriverProc(int _private, int id, int msg, int arg1, int arg2) -{ - dbgprintf("DefDriverProc(0x%x, 0x%x, 0x%x, 0x%x, 0x%x) => 0\n", _private, id, msg, arg1, arg2); +static int WINAPI expDefDriverProc(int private, int id, int msg, int arg1, int arg2) +{ + dbgprintf("DefDriverProc(0x%x, 0x%x, 0x%x, 0x%x, 0x%x) => 0\n", private, id, msg, arg1, arg2); return 0; } @@ -3038,7 +3038,7 @@ } /* - typedef struct _TIME_ZONE_INFORMATION { + typedef struct TIME_ZONE_INFORMATION { long Bias; char StandardName[32]; SYSTEMTIME StandardDate; @@ -4004,8 +4004,8 @@ } #else /* merged from wine - 2002.04.21 */ -typedef void (*_INITTERMFUNC)(); -static int exp_initterm(_INITTERMFUNC *start, _INITTERMFUNC *end) +typedef void (*INITTERMFUNC)(); +static int exp_initterm(INITTERMFUNC *start, INITTERMFUNC *end) { dbgprintf("_initterm(0x%x, 0x%x) %p\n", start, end, *start); while (start < end)