[ros-diffs] [cfinck] 34027: GCC 4.3.x fixes for cabman and sysreg Also clean up sysreg a bit and put all #include's for standard headers in the .h files. (they were spread around the .cpp and the .h files previously) See issue #3370 for more details.

Author: cfinck
Date: Thu Jun 19 12:07:38 2008
New Revision: 34027

URL: http://svn.reactos.org/svn/reactos?rev=34027&view=rev
Log:
GCC 4.3.x fixes for cabman and sysreg
Also clean up sysreg a bit and put all #include's for standard headers in the .h
files. (they were spread around the .cpp and the .h files previously)

See issue #3370 for more details.

Modified:
    trunk/reactos/tools/cabman/dfp.cxx
    trunk/reactos/tools/sysreg/conf_parser.cpp
    trunk/reactos/tools/sysreg/conf_parser.h
    trunk/reactos/tools/sysreg/env_var.cpp
    trunk/reactos/tools/sysreg/env_var.h
    trunk/reactos/tools/sysreg/file_reader.cpp
    trunk/reactos/tools/sysreg/file_reader.h
    trunk/reactos/tools/sysreg/namedpipe_reader.cpp
    trunk/reactos/tools/sysreg/namedpipe_reader.h
    trunk/reactos/tools/sysreg/os_support.cpp
    trunk/reactos/tools/sysreg/os_support.h
    trunk/reactos/tools/sysreg/pipe_reader.cpp
    trunk/reactos/tools/sysreg/pipe_reader.h
    trunk/reactos/tools/sysreg/rosboot_test.cpp
    trunk/reactos/tools/sysreg/rosboot_test.h

Modified: trunk/reactos/tools/cabman/dfp.cxx
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=3…
==============================================================================
--- trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] (original)
+++ trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -1373,8 +1373,8 @@
                 return;
             }
             i = 0;
-            while ((CurrentChar + i < LineLength) &&
-                (((ch = Line[CurrentChar + i]) >= 'a') && (ch <=
'z')) ||
+            while (((CurrentChar + i < LineLength) &&
+                (((ch = Line[CurrentChar + i]) >= 'a') && (ch <=
'z'))) ||
                 ((ch >= 'A') && (ch <= 'Z')) || (ch ==
'_'))
             {
                 CurrentString[i] = ch;

Modified: trunk/reactos/tools/sysreg/conf_parser.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c…
==============================================================================
--- trunk/reactos/tools/sysreg/conf_parser.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/conf_parser.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -8,11 +8,6 @@
  */
 
 #include "conf_parser.h"
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#include <cstdio>
-#include <cstdlib>
 
 namespace Sysreg_
 {

Modified: trunk/reactos/tools/sysreg/conf_parser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.h…
==============================================================================
--- trunk/reactos/tools/sysreg/conf_parser.h [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/conf_parser.h [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -12,6 +12,11 @@
 
 #include "user_types.h"
 #include <map>
+#include <iostream>
+#include <sstream>
+#include <fstream>
+#include <cstdio>
+#include <cstdlib>
 
 namespace Sysreg_
 {

Modified: trunk/reactos/tools/sysreg/env_var.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.cpp?r…
==============================================================================
--- trunk/reactos/tools/sysreg/env_var.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/env_var.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -9,9 +9,6 @@
 
 
 #include "env_var.h"
-#include <iostream>
-#include <cstdlib>
-#include <cstring>
 
 namespace System_
 {

Modified: trunk/reactos/tools/sysreg/env_var.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.h?rev…
==============================================================================
--- trunk/reactos/tools/sysreg/env_var.h [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/env_var.h [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -12,7 +12,9 @@
 
 #include "user_types.h"
 #include <map>
-
+#include <iostream>
+#include <cstdlib>
+#include <cstring>
 
 namespace System_
 {

Modified: trunk/reactos/tools/sysreg/file_reader.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_reader.c…
==============================================================================
--- trunk/reactos/tools/sysreg/file_reader.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/file_reader.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -8,9 +8,6 @@
  */
 
 #include "file_reader.h"
-#include <cassert>
-#include <cstdio>
-#include <cstring>
 
 namespace System_
 {

Modified: trunk/reactos/tools/sysreg/file_reader.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_reader.h…
==============================================================================
--- trunk/reactos/tools/sysreg/file_reader.h [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/file_reader.h [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -14,6 +14,10 @@
 #include "user_types.h"
 #include "data_source.h"
 #include <vector>
+#include <cassert>
+#include <cstdio>
+#include <cstring>
+
 namespace System_
 {
 	using std::vector;

Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea…
==============================================================================
--- trunk/reactos/tools/sysreg/namedpipe_reader.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -10,10 +10,6 @@
 
 #include "namedpipe_reader.h"
 
-#include <iostream>
-#include <cassert>
-#include <cstring>
-
 namespace System_
 {
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))

Modified: trunk/reactos/tools/sysreg/namedpipe_reader.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea…
==============================================================================
--- trunk/reactos/tools/sysreg/namedpipe_reader.h [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/namedpipe_reader.h [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -16,8 +16,11 @@
 #include "user_types.h"
 #include "data_source.h"
 #include <vector>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
+#include <iostream>
+#include <cassert>
+#include <cstring>
 
 #if defined(WIN32)
 #include <windows.h>
@@ -25,8 +28,6 @@
 #else
 #include <unistd.h>
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
 #define NULLVAL 0
 #define DWORD unsigned long
 #define HANDLE long

Modified: trunk/reactos/tools/sysreg/os_support.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp…
==============================================================================
--- trunk/reactos/tools/sysreg/os_support.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/os_support.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -8,7 +8,6 @@
  */
 
 #include "os_support.h"
-#include <cstdlib>
 
 namespace System_
 {

Modified: trunk/reactos/tools/sysreg/os_support.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?…
==============================================================================
--- trunk/reactos/tools/sysreg/os_support.h [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/os_support.h [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -22,6 +22,7 @@
 #include "user_types.h"
 #include <ctime>
 #include <vector>
+#include <cstdlib>
 
 #ifndef _MSC_VER
 #include <sys/time.h>

Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c…
==============================================================================
--- trunk/reactos/tools/sysreg/pipe_reader.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/pipe_reader.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -8,9 +8,6 @@
  */
 
 #include "pipe_reader.h"
-
-#include <iostream>
-#include <assert.h>
 
 namespace System_
 {

Modified: trunk/reactos/tools/sysreg/pipe_reader.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.h…
==============================================================================
--- trunk/reactos/tools/sysreg/pipe_reader.h [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/pipe_reader.h [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -15,7 +15,11 @@
 #include "user_types.h"
 #include "data_source.h"
 #include <cstdio>
-//#include <stdlib.h>
+#include <iostream>
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
+#include <limits.h>
 
 namespace System_
 {

Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.…
==============================================================================
--- trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -10,28 +10,6 @@
 
 
 #include "rosboot_test.h"
-#include "pipe_reader.h"
-#include "namedpipe_reader.h"
-//#include "sym_file.h"
-#include "file_reader.h"
-#include "os_support.h"
-#include "env_var.h"
-
-#include <iostream>
-#include <vector>
-#include <fstream>
-#include <cassert>
-#include <cfloat>
-#include <cmath>
-#include <csignal>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <ctime>
-#ifndef __LINUX__
-#include <io.h>
-#include <errno.h>
-#endif
 
 namespace Sysreg_
 {

Modified: trunk/reactos/tools/sysreg/rosboot_test.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.…
==============================================================================
--- trunk/reactos/tools/sysreg/rosboot_test.h [iso-8859-1] (original)
+++ trunk/reactos/tools/sysreg/rosboot_test.h [iso-8859-1] Thu Jun 19 12:07:38 2008
@@ -13,7 +13,28 @@
 #include "conf_parser.h"
 #include "os_support.h"
 #include "user_types.h"
+#include "pipe_reader.h"
+#include "namedpipe_reader.h"
+#include "file_reader.h"
+#include "os_support.h"
+#include "env_var.h"
 #include <vector>
+#include <iostream>
+#include <vector>
+#include <fstream>
+#include <cassert>
+#include <cfloat>
+#include <cmath>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#ifndef __LINUX__
+#include <io.h>
+#include <errno.h>
+#endif
+
 #ifdef __LINUX__
 #include <unistd.h>
 #include <sys/types.h>