From 38e23cc6cb13a3467fa73ec8279a5bf8a9d0af9b Mon Sep 17 00:00:00 2001 From: CaS Date: Sat, 5 Nov 2005 17:41:01 +0000 Subject: [PATCH] avoid some compiler warnings fix oen inforrect use of ansi mingw function git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21956 72102866-910b-0410-8b05-ffd578937521 --- Source/NSLog.m | 2 +- Source/objc-load.h | 32 +++++++++++++++++++++++-------- Source/objc-load.m | 22 ++++++++++++++++++--- Source/win32-load.h | 6 +++--- Source/win32/NSMessagePortWin32.m | 14 ++++++++------ 5 files changed, 55 insertions(+), 21 deletions(-) diff --git a/Source/NSLog.m b/Source/NSLog.m index 7e750cf77..e1458ed9b 100644 --- a/Source/NSLog.m +++ b/Source/NSLog.m @@ -151,7 +151,7 @@ _NSLog_standard_printf_handler (NSString* message) if (!eventloghandle) { - eventloghandle = RegisterEventSource(NULL, + eventloghandle = RegisterEventSourceW(NULL, UNISTR([[NSProcessInfo processInfo] processName])); } if (eventloghandle) diff --git a/Source/objc-load.h b/Source/objc-load.h index 87baeab45..0cc10f8fb 100644 --- a/Source/objc-load.h +++ b/Source/objc-load.h @@ -39,24 +39,40 @@ #define LINKER_GETSYMBOL 0 #endif +#if defined(__MINGW32__) +extern long objc_load_module( + const unichar *filename, + FILE *errorStream, + void (*loadCallback)(Class, struct objc_category *), + void **header, + const unichar *debugFilename); + +extern long objc_load_modules( + const unichar *files[], + FILE *errorStream, + void (*callback)(Class,struct objc_category *), + void **header, + const unichar *debugFilename); +#else extern long objc_load_module( const char *filename, FILE *errorStream, void (*loadCallback)(Class, struct objc_category *), void **header, - char *debugFilename); + const char *debugFilename); + +extern long objc_load_modules( + const char *files[], + FILE *errorStream, + void (*callback)(Class,struct objc_category *), + void **header, + const char *debugFilename); +#endif extern long objc_unload_module( FILE *errorStream, void (*unloadCallback)(Class, struct objc_category *)); -extern long objc_load_modules( - char *files[], - FILE *errorStream, - void (*callback)(Class,struct objc_category *), - void **header, - char *debugFilename); - extern long objc_unload_modules( FILE *errorStream, void (*unloadCallback)(Class, struct objc_category *)); diff --git a/Source/objc-load.m b/Source/objc-load.m index a8936d6da..c86f27956 100644 --- a/Source/objc-load.m +++ b/Source/objc-load.m @@ -145,12 +145,21 @@ objc_load_callback(Class class, struct objc_category * category) } } +#if defined(__MINGW32__) +long +objc_load_module (const unichar *filename, + FILE *errorStream, + void (*loadCallback)(Class, struct objc_category *), + void **header, + const unichar *debugFilename) +#else long objc_load_module (const char *filename, FILE *errorStream, void (*loadCallback)(Class, struct objc_category *), void **header, - char *debugFilename) + const char *debugFilename) +#endif { #ifdef NeXT_RUNTIME int errcode; @@ -254,10 +263,17 @@ objc_unload_module(FILE *errorStream, return 0; } -long objc_load_modules(char *files[],FILE *errorStream, +#if defined(__MINGW32__) +long objc_load_modules(const unichar *files[],FILE *errorStream, void (*callback)(Class,struct objc_category *), void **header, - char *debugFilename) + const unichar *debugFilename) +#else +long objc_load_modules(const char *files[],FILE *errorStream, + void (*callback)(Class,struct objc_category *), + void **header, + const char *debugFilename) +#endif { while (*files) { diff --git a/Source/win32-load.h b/Source/win32-load.h index 3150a9b0c..2e49e0cfa 100644 --- a/Source/win32-load.h +++ b/Source/win32-load.h @@ -43,9 +43,9 @@ __objc_dynamic_init(const char* exec_path) be used to get information about the loded code. */ static dl_handle_t -__objc_dynamic_link(const char* module, int mode, const char* debug_file) +__objc_dynamic_link(const unichar* module, int mode, const unichar* debug_file) { - return LoadLibraryExW((const unichar*)module, 0, 0); + return LoadLibraryExW(module, 0, 0); } /* Return the address of a symbol given by the name 'symbol' from the module @@ -80,7 +80,7 @@ __objc_dynamic_get_symbol_path(dl_handle_t handle, dl_symbol_t symbol) static void __objc_dynamic_error(FILE *error_stream, const char *error_string) { - fprintf(error_stream, "%s:%d\n", error_string, GetLastError()); + fprintf(error_stream, "%s:%ld\n", error_string, (long)GetLastError()); } /* Debugging: define these if they are available */ diff --git a/Source/win32/NSMessagePortWin32.m b/Source/win32/NSMessagePortWin32.m index 1622d2c5f..62b264c59 100644 --- a/Source/win32/NSMessagePortWin32.m +++ b/Source/win32/NSMessagePortWin32.m @@ -53,11 +53,6 @@ #define UNISTR(X) \ ((const unichar*)[(X) cStringUsingEncoding: NSUnicodeStringEncoding]) -/* - * Largest chunk of data possible in DO - */ -static gsu32 maxDataLength = 10 * 1024 * 1024; - #if 0 #define M_LOCK(X) {NSDebugMLLog(@"NSMessagePort",@"lock %@",X); [X lock];} #define M_UNLOCK(X) {NSDebugMLLog(@"NSMessagePort",@"unlock %@",X); [X unlock];} @@ -104,6 +99,13 @@ typedef struct { unsigned char addr[0]; /* name of the port on the local host */ } GSPortInfo; +#if 0 + +/* + * Largest chunk of data possible in DO + */ +static gsu32 maxDataLength = 10 * 1024 * 1024; + /* * Utility functions for encoding and decoding ports. */ @@ -153,6 +155,7 @@ newDataWithEncodedPort(NSMessagePort *port) return data; } +#endif @implementation NSMessagePort @@ -428,7 +431,6 @@ static unsigned wordAlign; extra: (void*)extra forMode: (NSString*)mode { - HANDLE h = (HANDLE)(gsaddr)extra; }