From ecc35e680b1d5093c7f7cebce25117e6fb384b1c Mon Sep 17 00:00:00 2001
From: Adrian Taylor <adrian@macrobug.com>
Date: Thu, 29 Oct 2009 11:01:00 +0000
Subject: Fixes to allow release-1.0 to build under Ubuntu 9.04.

This commit contains fixes to allow the release-1.0 branch to build under Ubuntu 9.04 x86-64.

I have not tested the build on other platforms. It's quite possible that this breaks the build on other platforms. It therefore seems a bad idea to approve this change at code-review time unless you can convince yourself the other platforms will be fine.

But even if it doesn't get approved, it is still worth uploading for the benefit of others who wish to get release-1.0 to build under Ubuntu 9.04.

This is the final of three commits in different packages.
---
 tools/aidl/aidl.cpp           | 2 ++
 tools/aidl/generate_java.cpp  | 1 +
 tools/aidl/options.cpp        | 1 +
 tools/aidl/search_path.cpp    | 1 +
 tools/aidl/search_path.h      | 1 +
 tools/localize/Perforce.cpp   | 2 ++
 tools/localize/XLIFFFile.cpp  | 2 ++
 tools/localize/XMLHandler.cpp | 2 ++
 tools/localize/file_utils.cpp | 2 ++
 tools/localize/localize.cpp   | 1 +
 10 files changed, 15 insertions(+)

diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp
index 927d21e49af6..8e9bd8039367 100644
--- a/tools/aidl/aidl.cpp
+++ b/tools/aidl/aidl.cpp
@@ -10,6 +10,8 @@
 #include <sys/stat.h>
 
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 #include <map>
 
 #ifdef HAVE_MS_C_RUNTIME
diff --git a/tools/aidl/generate_java.cpp b/tools/aidl/generate_java.cpp
index 7f84ff4425d1..7ab197b4c7cb 100644
--- a/tools/aidl/generate_java.cpp
+++ b/tools/aidl/generate_java.cpp
@@ -2,6 +2,7 @@
 #include "AST.h"
 #include "Type.h"
 #include <stdio.h>
+#include <string.h>
 
 // =================================================
 class VariableFactory
diff --git a/tools/aidl/options.cpp b/tools/aidl/options.cpp
index a8905568b5d3..ebceb018461e 100644
--- a/tools/aidl/options.cpp
+++ b/tools/aidl/options.cpp
@@ -1,5 +1,6 @@
 
 #include "options.h"
+#include <string.h>
 
 static int
 usage()
diff --git a/tools/aidl/search_path.cpp b/tools/aidl/search_path.cpp
index 3c4e14b3a01d..9eec280eece3 100644
--- a/tools/aidl/search_path.cpp
+++ b/tools/aidl/search_path.cpp
@@ -1,4 +1,5 @@
 #include <unistd.h>
+#include <string.h>
 #include "search_path.h"
 #include "options.h"
 
diff --git a/tools/aidl/search_path.h b/tools/aidl/search_path.h
index 8d85d813161e..2bf94b12bbf1 100644
--- a/tools/aidl/search_path.h
+++ b/tools/aidl/search_path.h
@@ -5,6 +5,7 @@
 
 #if __cplusplus
 #include <vector>
+#include <string>
 using namespace std;
 extern "C" {
 #endif
diff --git a/tools/localize/Perforce.cpp b/tools/localize/Perforce.cpp
index 3184dfc22c2e..2b314dac98a6 100644
--- a/tools/localize/Perforce.cpp
+++ b/tools/localize/Perforce.cpp
@@ -3,6 +3,8 @@
 #include <sstream>
 #include <sys/types.h>
 #include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
 #include <sys/wait.h>
 
 using namespace std;
diff --git a/tools/localize/XLIFFFile.cpp b/tools/localize/XLIFFFile.cpp
index 5da05a27bd47..cf5d0ce7056d 100644
--- a/tools/localize/XLIFFFile.cpp
+++ b/tools/localize/XLIFFFile.cpp
@@ -2,6 +2,8 @@
 
 #include <sys/time.h>
 #include <time.h>
+#include <stdlib.h>
+#include <algorithm>
 
 const char* const XLIFF_XMLNS = "urn:oasis:names:tc:xliff:document:1.2";
 
diff --git a/tools/localize/XMLHandler.cpp b/tools/localize/XMLHandler.cpp
index 64af7afd4ae2..90bfd71bcf1b 100644
--- a/tools/localize/XMLHandler.cpp
+++ b/tools/localize/XMLHandler.cpp
@@ -3,9 +3,11 @@
 #include <expat.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
+#include <algorithm>
 
 #define NS_SEPARATOR 1
 #define MORE_INDENT "  "
diff --git a/tools/localize/file_utils.cpp b/tools/localize/file_utils.cpp
index 943170912de0..a0a8a89b5339 100644
--- a/tools/localize/file_utils.cpp
+++ b/tools/localize/file_utils.cpp
@@ -4,6 +4,8 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <host/Directories.h>
+#include <stdlib.h>
+#include <string.h>
 #include "log.h"
 
 string
diff --git a/tools/localize/localize.cpp b/tools/localize/localize.cpp
index d03c811b29b7..cdf338a5ed36 100644
--- a/tools/localize/localize.cpp
+++ b/tools/localize/localize.cpp
@@ -14,6 +14,7 @@
 #include <sstream>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 using namespace std;
 
-- 
cgit v1.2.3