MAPREDUCE-1251. Merge -c 1135736 from branch-0.20-security to branch-0.20-security-204.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-204@1135738 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -93,6 +93,8 @@ Release 0.20.204.0 - unreleased
     HDFS-1767. Namenode ignores non-initial block report from datanodes
     when in safemode during startup. (Matt Foley via suresh)
 
+    MAPREDUCE-1251. c++ utils doesn't compile. (Eli Collins via shv)
+
 Release 0.20.203.1 - Unreleased
 
     HADOOP-7330. Fix MetricsSourceAdapter to use the value instead of the 

src/c++/pipes/api/hadoop/Pipes.hh

@@ -31,6 +31,8 @@
 #include <string>
 #endif
 
+#include <stdint.h>
+
 namespace HadoopPipes {
 
 /**

src/c++/utils/api/hadoop/SerialUtils.hh

@@ -19,6 +19,7 @@
 #define HADOOP_SERIAL_UTILS_HH
 
 #include <string>
+#include <stdint.h>
 
 namespace HadoopUtils {