[ros-diffs] [cfinck] 32105: - Use host/typedefs.h for rsym instead of reinventing the wheel for host types - Get rsym to compile warning-free under any host

Author: cfinck
Date: Sun Feb  3 16:53:27 2008
New Revision: 32105

URL: http://svn.reactos.org/svn/reactos?rev=32105&view=rev
Log:
- Use host/typedefs.h for rsym instead of reinventing the wheel for host types
- Get rsym to compile warning-free under any host

Modified:
    trunk/reactos/tools/rsym.c
    trunk/reactos/tools/rsym.h
    trunk/reactos/tools/rsym.mak

Modified: trunk/reactos/tools/rsym.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.c?rev=32105&...
==============================================================================
--- trunk/reactos/tools/rsym.c (original)
+++ trunk/reactos/tools/rsym.c Sun Feb  3 16:53:27 2008
@@ -490,7 +490,7 @@
   *ProcessedRelocs = malloc(RelocSectionHeader->SizeOfRawData);
   if (NULL == *ProcessedRelocs)
     {
-      fprintf(stderr, "Failed to allocate %lu bytes for relocations\n", RelocSectionHeader->SizeOfRawData);
+      fprintf(stderr, "Failed to allocate %u bytes for relocations\n", (UINT)RelocSectionHeader->SizeOfRawData);
       return 1;
     }
   *ProcessedRelocsLength = 0;
@@ -566,7 +566,7 @@
   OutHeader = malloc(StartOfRawData);
   if (NULL == OutHeader)
     {
-      fprintf(stderr, "Failed to allocate %lu bytes for output file header\n", StartOfRawData);
+      fprintf(stderr, "Failed to allocate %u bytes for output file header\n", (UINT)StartOfRawData);
       return 1;
     }
   memset(OutHeader, '\0', StartOfRawData);
@@ -679,7 +679,7 @@
       PaddedRosSym = malloc(RosSymFileLength);
       if (NULL == PaddedRosSym)
         {
-          fprintf(stderr, "Failed to allocate %lu bytes for padded .rossym\n", RosSymFileLength);
+          fprintf(stderr, "Failed to allocate %u bytes for padded .rossym\n", (UINT)RosSymFileLength);
           return 1;
         }
       memcpy(PaddedRosSym, RosSymSection, RosSymLength);

Modified: trunk/reactos/tools/rsym.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.h?rev=32105&...
==============================================================================
--- trunk/reactos/tools/rsym.h (original)
+++ trunk/reactos/tools/rsym.h Sun Feb  3 16:53:27 2008
@@ -10,28 +10,7 @@

#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16

-typedef unsigned char BYTE;
-typedef unsigned char UCHAR;
-typedef unsigned short WORD;
-typedef unsigned short USHORT;
-#if defined(__x86_64__) && defined(unix)
-typedef signed int LONG;
-typedef unsigned int ULONG;
-typedef unsigned int DWORD;
-#else
-typedef signed long LONG;
-typedef unsigned long ULONG;
-typedef unsigned long DWORD;
-#endif
-#if defined(_WIN64)
-typedef unsigned __int64 ULONG_PTR;
-#else
-#if defined(__x86_64__) && defined(unix)
-typedef  unsigned int  ULONG_PTR;
-#else
-typedef  unsigned long ULONG_PTR;
-#endif
-#endif
+#include <host/typedefs.h>

#pragma pack(2)
 typedef struct _IMAGE_DOS_HEADER {

Modified: trunk/reactos/tools/rsym.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.mak?rev=32105&am...
==============================================================================
--- trunk/reactos/tools/rsym.mak (original)
+++ trunk/reactos/tools/rsym.mak Sun Feb  3 16:53:27 2008
@@ -16,7 +16,7 @@
 RSYM_OBJECTS = \
    $(addprefix $(INTERMEDIATE_), $(RSYM_SOURCES:.c=.o))

-RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS)
+RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) -Iinclude

RSYM_HOST_LFLAGS = $(TOOLS_LFLAGS)