Fix few compiler/linker warnings.
authorFilip Navara <filip.navara@gmail.com>
Fri, 20 Aug 2004 15:19:38 +0000 (15:19 +0000)
committerFilip Navara <filip.navara@gmail.com>
Fri, 20 Aug 2004 15:19:38 +0000 (15:19 +0000)
svn path=/trunk/; revision=10618

reactos/lib/freetype/Makefile
reactos/lib/iphlpapi/resinfo_reactos.c
reactos/lib/msvcrt/wine/cppexcept.c
reactos/lib/msvcrt/wine/main.c
reactos/lib/msvcrt/wine/thread.c
reactos/subsys/system/explorer/notifyhook/Makefile
reactos/subsys/win32k/tests/tests/eng-mem-1.c

index cbcd674..1f0b390 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.10 2004/08/01 23:27:55 navaraf Exp $
+# $Id: Makefile,v 1.11 2004/08/20 15:19:38 navaraf Exp $
 
 PATH_TO_TOP = ../..
 
@@ -39,9 +39,9 @@ all: $(MK_FULLNAME) $(MK_NOSTRIPNAME)
 
 objs/*.o objs/libfreetype.a:
 ifeq ($(DBG), 1)
-       @$(MAKE) -f Makefile.freetype CFLAGS="-c -g -Wall" CC:=$(CC)
+       @$(MAKE) -f Makefile.freetype CFLAGS="-c -g -Wall -fno-strict-aliasing" CC:=$(CC)
 else
-       @$(MAKE) -f Makefile.freetype CFLAGS="-c -Wall -O3" CC:=$(CC)
+       @$(MAKE) -f Makefile.freetype CFLAGS="-c -Wall -O3 -fno-strict-aliasing" CC:=$(CC)
 endif
 
 # Automatic dependency tracking
index a880a71..0965a50 100644 (file)
@@ -54,7 +54,7 @@ PIPHLP_RES_INFO getResInfo() {
                                     sizeof(PIPHLP_RES_INFO) );
     if( InfoPtr ) {
         InfoPtr->riCount = 0;
-        InfoPtr->riAddressList = (LPSOCKADDR)0;
+        InfoPtr->riAddressList = NULL;
     }
 
     return InfoPtr;
index 3fa9714..80c1554 100644 (file)
@@ -303,8 +303,8 @@ inline static void *call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame
             /* setup an exception block for nested exceptions */
 
             //nested_frame.frame.Handler = catch_function_nested_handler;
-                       nested_frame.frame.handler = catch_function_nested_handler;
-                       nested_frame.prev_rec  = thread_data->exc_record;
+            nested_frame.frame.handler = (PEXCEPTION_HANDLER)catch_function_nested_handler;
+            nested_frame.prev_rec  = thread_data->exc_record;
             nested_frame.cxx_frame = frame;
             nested_frame.descr     = descr;
             nested_frame.trylevel  = nested_trylevel + 1;
index 528b959..eb5791b 100644 (file)
@@ -54,7 +54,7 @@ static inline BOOL msvcrt_init_tls(void);
 static inline BOOL msvcrt_free_tls(void);
 //const char* msvcrt_get_reason(DWORD reason) WINE_UNUSED;
 
-typedef void* (*MSVCRT_malloc_func)(MSVCRT_size_t);
+typedef void* (*MSVCRT_malloc_func)(size_t);
 
 char* MSVCRT___unDName(char *,const char*,int,MSVCRT_malloc_func,MSVCRT_free_func,unsigned short int);
 char* MSVCRT___unDNameEx(char *,const char*,int,MSVCRT_malloc_func,MSVCRT_free_func,void *,unsigned short int);
index aa74170..ff64b9c 100644 (file)
@@ -28,6 +28,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
+void _amsg_exit (int errnum);
+
 /********************************************************************/
 
 typedef struct {
index eadcf53..769f939 100644 (file)
@@ -5,6 +5,7 @@ TARGET_CFLAGS := -D__USE_W32API -D_WIN32_IE=0x0600 -Wall -D_NOTIFYHOOK_IMPL
 TARGET_NORC := yes
 TARGET_DEFONLY := yes
 TARGET_OBJECTS := notifyhook.o
+TARGET_LFLAGS := -nostartfiles
 TARGET_BASE = $(TARGET_BASE_LIB_NOTIFYHOOK)
 
 include $(PATH_TO_TOP)/rules.mak
index 580e83c..e2ee59c 100644 (file)
@@ -13,14 +13,14 @@ static int RunTest(char *Buffer)
   /* Allocate memory with EngAllocMem */
   pmem1 = 0;
   AllocSize1 = 1024;
-  AllocTag1 = "zyxD";
+  AllocTag1 = TAG('D','x','y','z');
   pmem1 = EngAllocMem(FL_ZERO_MEMORY, AllocSize1, AllocTag1);
   FAIL_IF_EQUAL(pmem1, 0, "EngAllocMem() for pmem1 failed");
 
   /* Allocate memory with EngAllocMem */
   pmem2 = 0;
   AllocSize2 = 1024;
-  AllocTag2 = "zyxD";
+  AllocTag2 = TAG('D','x','y','z');
   pmem2 = EngAllocUserMem(AllocSize2, AllocTag2);
   FAIL_IF_EQUAL(pmem1, 0, "EngAllocUserMem() for pmem2 failed");