From fa77a22c5038a23da23d2f03f527d017ff307257 Mon Sep 17 00:00:00 2001
From: Colin Finck <colin@reactos.org>
Date: Thu, 19 Jun 2008 17:07:38 +0000
Subject: [PATCH] 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.

svn path=/trunk/; revision=34027
---
 reactos/tools/cabman/dfp.cxx              |  4 ++--
 reactos/tools/sysreg/conf_parser.cpp      |  5 -----
 reactos/tools/sysreg/conf_parser.h        |  5 +++++
 reactos/tools/sysreg/env_var.cpp          |  3 ---
 reactos/tools/sysreg/env_var.h            |  4 +++-
 reactos/tools/sysreg/file_reader.cpp      |  3 ---
 reactos/tools/sysreg/file_reader.h        |  4 ++++
 reactos/tools/sysreg/namedpipe_reader.cpp |  4 ----
 reactos/tools/sysreg/namedpipe_reader.h   |  9 +++++----
 reactos/tools/sysreg/os_support.cpp       |  1 -
 reactos/tools/sysreg/os_support.h         |  1 +
 reactos/tools/sysreg/pipe_reader.cpp      |  3 ---
 reactos/tools/sysreg/pipe_reader.h        |  6 +++++-
 reactos/tools/sysreg/rosboot_test.cpp     | 22 ----------------------
 reactos/tools/sysreg/rosboot_test.h       | 21 +++++++++++++++++++++
 15 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/reactos/tools/cabman/dfp.cxx b/reactos/tools/cabman/dfp.cxx
index 2c8995a5f84..c40756d3284 100755
--- a/reactos/tools/cabman/dfp.cxx
+++ b/reactos/tools/cabman/dfp.cxx
@@ -1373,8 +1373,8 @@ void CDFParser::NextToken()
                 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;
diff --git a/reactos/tools/sysreg/conf_parser.cpp b/reactos/tools/sysreg/conf_parser.cpp
index 62818a8f269..f999a4fca5b 100644
--- a/reactos/tools/sysreg/conf_parser.cpp
+++ b/reactos/tools/sysreg/conf_parser.cpp
@@ -8,11 +8,6 @@
  */
 
 #include "conf_parser.h"
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#include <cstdio>
-#include <cstdlib>
 
 namespace Sysreg_
 {
diff --git a/reactos/tools/sysreg/conf_parser.h b/reactos/tools/sysreg/conf_parser.h
index 35f6aa5495f..78991263cf7 100644
--- a/reactos/tools/sysreg/conf_parser.h
+++ b/reactos/tools/sysreg/conf_parser.h
@@ -12,6 +12,11 @@
 
 #include "user_types.h"
 #include <map>
+#include <iostream>
+#include <sstream>
+#include <fstream>
+#include <cstdio>
+#include <cstdlib>
 
 namespace Sysreg_
 {
diff --git a/reactos/tools/sysreg/env_var.cpp b/reactos/tools/sysreg/env_var.cpp
index 219734d8146..a9958baae42 100644
--- a/reactos/tools/sysreg/env_var.cpp
+++ b/reactos/tools/sysreg/env_var.cpp
@@ -9,9 +9,6 @@
 
 
 #include "env_var.h"
-#include <iostream>
-#include <cstdlib>
-#include <cstring>
 
 namespace System_
 {
diff --git a/reactos/tools/sysreg/env_var.h b/reactos/tools/sysreg/env_var.h
index 7c66376dea6..2b82b194509 100644
--- a/reactos/tools/sysreg/env_var.h
+++ b/reactos/tools/sysreg/env_var.h
@@ -12,7 +12,9 @@
 
 #include "user_types.h"
 #include <map>
-
+#include <iostream>
+#include <cstdlib>
+#include <cstring>
 
 namespace System_
 {
diff --git a/reactos/tools/sysreg/file_reader.cpp b/reactos/tools/sysreg/file_reader.cpp
index f6b186f730b..6997d6ac82d 100644
--- a/reactos/tools/sysreg/file_reader.cpp
+++ b/reactos/tools/sysreg/file_reader.cpp
@@ -8,9 +8,6 @@
  */
 
 #include "file_reader.h"
-#include <cassert>
-#include <cstdio>
-#include <cstring>
 
 namespace System_
 {
diff --git a/reactos/tools/sysreg/file_reader.h b/reactos/tools/sysreg/file_reader.h
index 146e70a2267..aed6dbd3c5d 100644
--- a/reactos/tools/sysreg/file_reader.h
+++ b/reactos/tools/sysreg/file_reader.h
@@ -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;
diff --git a/reactos/tools/sysreg/namedpipe_reader.cpp b/reactos/tools/sysreg/namedpipe_reader.cpp
index 052b4c383a8..a9e5bc07c0f 100644
--- a/reactos/tools/sysreg/namedpipe_reader.cpp
+++ b/reactos/tools/sysreg/namedpipe_reader.cpp
@@ -10,10 +10,6 @@
 
 #include "namedpipe_reader.h"
 
-#include <iostream>
-#include <cassert>
-#include <cstring>
-
 namespace System_
 {
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
diff --git a/reactos/tools/sysreg/namedpipe_reader.h b/reactos/tools/sysreg/namedpipe_reader.h
index 901dc604e2f..fe1dcf4a721 100644
--- a/reactos/tools/sysreg/namedpipe_reader.h
+++ b/reactos/tools/sysreg/namedpipe_reader.h
@@ -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
diff --git a/reactos/tools/sysreg/os_support.cpp b/reactos/tools/sysreg/os_support.cpp
index 5338310db4f..35bd6c43d2b 100644
--- a/reactos/tools/sysreg/os_support.cpp
+++ b/reactos/tools/sysreg/os_support.cpp
@@ -8,7 +8,6 @@
  */
 
 #include "os_support.h"
-#include <cstdlib>
 
 namespace System_
 {
diff --git a/reactos/tools/sysreg/os_support.h b/reactos/tools/sysreg/os_support.h
index 25f69462685..0b40f7cbc4f 100644
--- a/reactos/tools/sysreg/os_support.h
+++ b/reactos/tools/sysreg/os_support.h
@@ -22,6 +22,7 @@
 #include "user_types.h"
 #include <ctime>
 #include <vector>
+#include <cstdlib>
 
 #ifndef _MSC_VER
 #include <sys/time.h>
diff --git a/reactos/tools/sysreg/pipe_reader.cpp b/reactos/tools/sysreg/pipe_reader.cpp
index 862a39470db..b3e97b35c28 100644
--- a/reactos/tools/sysreg/pipe_reader.cpp
+++ b/reactos/tools/sysreg/pipe_reader.cpp
@@ -9,9 +9,6 @@
 
 #include "pipe_reader.h"
 
-#include <iostream>
-#include <assert.h>
-
 namespace System_
 {
 	using std::vector;
diff --git a/reactos/tools/sysreg/pipe_reader.h b/reactos/tools/sysreg/pipe_reader.h
index d536f7682c9..17eaaf269ae 100644
--- a/reactos/tools/sysreg/pipe_reader.h
+++ b/reactos/tools/sysreg/pipe_reader.h
@@ -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_
 {
diff --git a/reactos/tools/sysreg/rosboot_test.cpp b/reactos/tools/sysreg/rosboot_test.cpp
index 18cc7a9c3ea..5000e9092cf 100644
--- a/reactos/tools/sysreg/rosboot_test.cpp
+++ b/reactos/tools/sysreg/rosboot_test.cpp
@@ -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_
 {
diff --git a/reactos/tools/sysreg/rosboot_test.h b/reactos/tools/sysreg/rosboot_test.h
index e2c0749cb7c..548c9e6e982 100644
--- a/reactos/tools/sysreg/rosboot_test.h
+++ b/reactos/tools/sysreg/rosboot_test.h
@@ -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>