[ros-diffs] [fireball] 32108: - Revert 32105 to make trunk bootable, as agreed with Colin.

[fireball at svn.reactos.org]

Author: fireball
Date: Mon Feb  4 00:47:35 2008
New Revision: 32108

URL: http://svn.reactos.org/svn/reactos?rev=32108&view=rev
Log:
- Revert 32105 to make trunk bootable, as agreed with Colin.

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=32108&r1=32107&r2=32108&view=diff
==============================================================================
--- trunk/reactos/tools/rsym.c (original)
+++ trunk/reactos/tools/rsym.c Mon Feb  4 00:47:35 2008
@@ -490,7 +490,7 @@
   *ProcessedRelocs = malloc(RelocSectionHeader->SizeOfRawData);
   if (NULL == *ProcessedRelocs)
     {
-      fprintf(stderr, "Failed to allocate %u bytes for relocations\n", (UINT)RelocSectionHeader->SizeOfRawData);
+      fprintf(stderr, "Failed to allocate %lu bytes for relocations\n", RelocSectionHeader->SizeOfRawData);
       return 1;
     }
   *ProcessedRelocsLength = 0;
@@ -566,7 +566,7 @@
   OutHeader = malloc(StartOfRawData);
   if (NULL == OutHeader)
     {
-      fprintf(stderr, "Failed to allocate %u bytes for output file header\n", (UINT)StartOfRawData);
+      fprintf(stderr, "Failed to allocate %lu bytes for output file header\n", StartOfRawData);
       return 1;
     }
   memset(OutHeader, '\0', StartOfRawData);
@@ -679,7 +679,7 @@
       PaddedRosSym = malloc(RosSymFileLength);
       if (NULL == PaddedRosSym)
         {
-          fprintf(stderr, "Failed to allocate %u bytes for padded .rossym\n", (UINT)RosSymFileLength);
+          fprintf(stderr, "Failed to allocate %lu bytes for padded .rossym\n", 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=32108&r1=32107&r2=32108&view=diff
==============================================================================
--- trunk/reactos/tools/rsym.h (original)
+++ trunk/reactos/tools/rsym.h Mon Feb  4 00:47:35 2008
@@ -10,7 +10,28 @@
 
 #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16
 
-#include <host/typedefs.h>
+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
 
 #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=32108&r1=32107&r2=32108&view=diff
==============================================================================
--- trunk/reactos/tools/rsym.mak (original)
+++ trunk/reactos/tools/rsym.mak Mon Feb  4 00:47:35 2008
@@ -16,7 +16,7 @@
 RSYM_OBJECTS = \
 	$(addprefix $(INTERMEDIATE_), $(RSYM_SOURCES:.c=.o))
 
-RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) -Iinclude
+RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS)
 
 RSYM_HOST_LFLAGS = $(TOOLS_LFLAGS)