[ros-diffs] [sginsberg] 42975: - Partial revert of 42973 for the systeminfo utility -- the issue was fixed in 42930 - GCC 4.1.3 doesn't support %I64 -- compile the code conditionally

Author: sginsberg
Date: Mon Aug 31 16:37:54 2009
New Revision: 42975

URL: http://svn.reactos.org/svn/reactos?rev=42975&view=rev
Log:
- Partial revert of 42973 for the systeminfo utility -- the issue was fixed in 42930
- GCC 4.1.3 doesn't support %I64 -- compile the code conditionally

Modified:
    trunk/rosapps/applications/devutils/symdump/symdump.c
    trunk/rosapps/applications/devutils/syscalldump/syscalldump.c
    trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c

Modified: trunk/rosapps/applications/devutils/symdump/symdump.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/symd…
==============================================================================
--- trunk/rosapps/applications/devutils/symdump/symdump.c [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/symdump/symdump.c [iso-8859-1] Mon Aug 31 16:37:54
2009
@@ -875,7 +875,12 @@
 		}
 		else
 		{
+#if defined(__GNUC__) && \
+	(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40400)
+		    printf("Symbol: %s, TypeIndex=%ld, Flags=%lx, Value=0x%llx\n",
+#else
 		    printf("Symbol: %s, TypeIndex=%ld, Flags=%lx, Value=0x%I64x\n",
+#endif
 		        pSymInfo->Name, pSymInfo->TypeIndex, pSymInfo->Flags,
pSymInfo->Value);
 			//if (pSymInfo->Flags & SYMFLAG_FUNCTION)
 			{

Modified: trunk/rosapps/applications/devutils/syscalldump/syscalldump.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/sysc…
==============================================================================
--- trunk/rosapps/applications/devutils/syscalldump/syscalldump.c [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/syscalldump/syscalldump.c [iso-8859-1] Mon Aug 31
16:37:54 2009
@@ -36,7 +36,12 @@
 		printf("SymGetSymFromName64() failed: %ld\n", GetLastError());
 		return 0;
 	}
+#if defined(__GNUC__) && \
+	(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40400)
+	printf("looking up adress for %s: 0x%llx\n", Name, pSym->Address);
+#else
 	printf("looking up adress for %s: 0x%I64x\n", Name, pSym->Address);
+#endif
 
 	NtHeaders = ImageNtHeader(pModule);
 	p = ImageRvaToVa(NtHeaders, pModule, pSym->Address - pSym->ModBase, NULL);

Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] Mon Aug 31
16:37:54 2009
@@ -358,8 +358,7 @@
 int
 main(int argc, char *argv[])
 {
-    char str[] = "/?";
-	if (argc > 1 && !strcmp(argv[1], str))
+	if (argc > 1 && !strcmp(argv[1], "/?"))
 	{
 		Usage();
 		return 0;