RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 08:12:17 +00:00
Code Issues Releases Wiki Activity

Avoid u_ BSD type names.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28197 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-12-27 12:03:51 +00:00
parent ce7fc9babc
commit 47044eb841
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
loader/pe_image.c
View File

@ -72,9 +72,9 @@ static void dump_exports( HMODULE hModule )
{ {
char *Module; char *Module;
unsigned int i, j; unsigned int i, j;
u_short *ordinal; unsigned short *ordinal;
u_long *function,*functions; unsigned long *function,*functions;
u_char **name; unsigned char **name;
unsigned int load_addr = hModule; unsigned int load_addr = hModule;
DWORD rva_start = PE_HEADER(hModule)->OptionalHeader DWORD rva_start = PE_HEADER(hModule)->OptionalHeader
@ -88,9 +88,9 @@ static void dump_exports( HMODULE hModule )
TRACE("Module name is %s, %ld functions, %ld names\n", TRACE("Module name is %s, %ld functions, %ld names\n",
Module, pe_exports->NumberOfFunctions, pe_exports->NumberOfNames); Module, pe_exports->NumberOfFunctions, pe_exports->NumberOfNames);
ordinal=(u_short*) RVA(pe_exports->AddressOfNameOrdinals); ordinal=(unsigned short*) RVA(pe_exports->AddressOfNameOrdinals);
functions=function=(u_long*) RVA(pe_exports->AddressOfFunctions); functions=function=(unsigned long*) RVA(pe_exports->AddressOfFunctions);
name=(u_char**) RVA(pe_exports->AddressOfNames); name=(unsigned char**) RVA(pe_exports->AddressOfNames);
TRACE(" Ord RVA Addr Name\n" ); TRACE(" Ord RVA Addr Name\n" );
for (i=0;i<pe_exports->NumberOfFunctions;i++, function++) for (i=0;i<pe_exports->NumberOfFunctions;i++, function++)
@ -126,15 +126,15 @@ FARPROC PE_FindExportedFunction(
LPCSTR funcName, LPCSTR funcName,
WIN_BOOL snoop ) WIN_BOOL snoop )
{ {
u_short * ordinals; unsigned short * ordinals;
u_long * function; unsigned long * function;
u_char ** name; unsigned char ** name;
const char *ename = NULL; const char *ename = NULL;
int i, ordinal; int i, ordinal;
PE_MODREF *pem = &(wm->binfmt.pe); PE_MODREF *pem = &(wm->binfmt.pe);
IMAGE_EXPORT_DIRECTORY *exports = pem->pe_export; IMAGE_EXPORT_DIRECTORY *exports = pem->pe_export;
unsigned int load_addr = wm->module; unsigned int load_addr = wm->module;
u_long rva_start, rva_end, addr; unsigned long rva_start, rva_end, addr;
char * forward; char * forward;
if (HIWORD(funcName)) if (HIWORD(funcName))
@ -149,9 +149,9 @@ FARPROC PE_FindExportedFunction(
WARN("Module %08x(%s)/MODREF %p doesn't have a exports table.\n",wm->module,wm->modname,pem); WARN("Module %08x(%s)/MODREF %p doesn't have a exports table.\n",wm->module,wm->modname,pem);
return NULL; return NULL;
} }
ordinals= (u_short*) RVA(exports->AddressOfNameOrdinals); ordinals= (unsigned short*) RVA(exports->AddressOfNameOrdinals);
function= (u_long*) RVA(exports->AddressOfFunctions); function= (unsigned long*) RVA(exports->AddressOfFunctions);
name = (u_char **) RVA(exports->AddressOfNames); name = (unsigned char **) RVA(exports->AddressOfNames);
forward = NULL; forward = NULL;
rva_start = PE_HEADER(wm->module)->OptionalHeader rva_start = PE_HEADER(wm->module)->OptionalHeader
.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress; .DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress;

2
stream/tcp.c
View File

@ -76,7 +76,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
char buf[255]; char buf[255];
#ifdef HAVE_WINSOCK2_H #ifdef HAVE_WINSOCK2_H
u_long val; unsigned long val;
int to; int to;
#else #else
struct timeval to; struct timeval to;