Author: szetszwo
Date: Thu Jun 7 17:56:04 2012
New Revision: 1347738
URL: http://svn.apache.org/viewvc?rev=1347738&view=rev
Log:
svn merge -c -1347092 for reverting HADOOP-8368 again.
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/.autom4te.cfg
- copied unchanged from r1347091,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/.autom4te.cfg
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/Makefile.am
- copied unchanged from r1347091,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/Makefile.am
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/acinclude.m4
- copied unchanged from r1347091,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/acinclude.m4
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/configure.ac
- copied unchanged from r1347091,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/configure.ac
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/lib/Makefile.am
- copied unchanged from r1347091,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/lib/Makefile.am
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am
- copied unchanged from r1347091,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am
Removed:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/CMakeLists.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/config.h.cmake
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Compressor.c
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Decompressor.c
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy.h
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/org_apache_hadoop_io_compress_zlib.h
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/util/NativeCrc32.c
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org_apache_hadoop.h
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1347738&r1=1347737&r2=1347738&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jun
7 17:56:04 2012
@@ -226,8 +226,6 @@ Branch-2 ( Unreleased changes )
HADOOP-8358. Config-related WARN for dfs.web.ugi can be avoided. (harsh)
- HADOOP-8368. Use CMake rather than autotools to build native code (ccccabe
via tucu)
-
HADOOP-8450. Remove src/test/system. (eli)
BUG FIXES
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml?rev=1347738&r1=1347737&r2=1347738&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml Thu Jun 7
17:56:04 2012
@@ -536,11 +536,32 @@
<snappy.prefix>/usr/local</snappy.prefix>
<snappy.lib>${snappy.prefix}/lib</snappy.lib>
<snappy.include>${snappy.prefix}/include</snappy.include>
- <runas.home></runas.home>
</properties>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <mkdir dir="${project.build.directory}/native/javah"/>
+ <copy toDir="${project.build.directory}/native">
+ <fileset dir="${basedir}/src/main/native"/>
+ </copy>
+ <mkdir dir="${project.build.directory}/native/m4"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native-maven-plugin</artifactId>
<executions>
@@ -569,27 +590,73 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>make-maven-plugin</artifactId>
<executions>
<execution>
- <id>make</id>
+ <id>compile</id>
<phase>compile</phase>
- <goals><goal>run</goal></goals>
- <configuration>
- <target>
- <exec executable="cmake"
dir="${project.build.directory}/native" failonerror="true">
- <arg line="${basedir}/src/
-DGENERATED_JAVAH=${project.build.directory}/native/javah
-DHADOOP_RUNAS_HOME=${runas.home}
-DJVM_ARCH_DATA_MODEL=${sun.arch.data.model}"/>
- <env key="CFLAGS" value="-I${snappy.include}"/>
- <env key="LDFLAGS" value="-L${snappy.lib}"/>
- </exec>
- <exec executable="make"
dir="${project.build.directory}/native" failonerror="true">
- <arg line="VERBOSE=1"/>
- </exec>
- </target>
- </configuration>
+ <goals>
+ <goal>autoreconf</goal>
+ <goal>configure</goal>
+ <goal>make-install</goal>
+ </goals>
</execution>
</executions>
+ <configuration>
+ <!-- autoreconf settings -->
+ <workDir>${project.build.directory}/native</workDir>
+ <arguments>
+ <argument>-i</argument>
+ <argument>-f</argument>
+ </arguments>
+
+ <!-- configure settings -->
+ <configureEnvironment>
+ <property>
+ <name>OS_NAME</name>
+ <value>${os.name}</value>
+ </property>
+ <property>
+ <name>OS_ARCH</name>
+ <value>${os.arch}</value>
+ </property>
+ <property>
+ <name>JVM_DATA_MODEL</name>
+ <value>${sun.arch.data.model}</value>
+ </property>
+ </configureEnvironment>
+ <configureOptions>
+ <configureOption>CPPFLAGS=-I${snappy.include}</configureOption>
+ <configureOption>LDFLAGS=-L${snappy.lib}</configureOption>
+ </configureOptions>
+
<configureWorkDir>${project.build.directory}/native</configureWorkDir>
+ <prefix>/usr/local</prefix>
+
+ <!-- make settings -->
+ <installEnvironment>
+ <property>
+ <name>OS_NAME</name>
+ <value>${os.name}</value>
+ </property>
+ <property>
+ <name>OS_ARCH</name>
+ <value>${os.arch}</value>
+ </property>
+ <property>
+ <name>JVM_DATA_MODEL</name>
+ <value>${sun.arch.data.model}</value>
+ </property>
+ <property>
+ <name>HADOOP_NATIVE_SRCDIR</name>
+ <value>${project.build.directory}/native</value>
+ </property>
+ </installEnvironment>
+
+ <!-- configure & make settings -->
+ <destDir>${project.build.directory}/native/target</destDir>
+
+ </configuration>
</plugin>
</plugins>
</build>
@@ -633,7 +700,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>kdc</id>
+ <id>compile</id>
<phase>compile</phase>
<goals>
<goal>run</goal>
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Compressor.c
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Compressor.c?rev=1347738&r1=1347737&r2=1347738&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Compressor.c
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Compressor.c
Thu Jun 7 17:56:04 2012
@@ -16,7 +16,10 @@
* limitations under the License.
*/
-#include "config.h"
+#if defined HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
#include "org_apache_hadoop.h"
#include "org_apache_hadoop_io_compress_lz4_Lz4Compressor.h"
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Decompressor.c
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Decompressor.c?rev=1347738&r1=1347737&r2=1347738&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Decompressor.c
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Decompressor.c
Thu Jun 7 17:56:04 2012
@@ -16,7 +16,10 @@
* limitations under the License.
*/
-#include "config.h"
+#if defined HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
#include "org_apache_hadoop.h"
#include "org_apache_hadoop_io_compress_lz4_Lz4Decompressor.h"
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c?rev=1347738&r1=1347737&r2=1347738&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
Thu Jun 7 17:56:04 2012
@@ -16,12 +16,36 @@
* limitations under the License.
*/
-#include <dlfcn.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#if defined HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
+#if defined HADOOP_SNAPPY_LIBRARY
+
+#if defined HAVE_STDIO_H
+ #include <stdio.h>
+#else
+ #error 'stdio.h not found'
+#endif
+
+#if defined HAVE_STDLIB_H
+ #include <stdlib.h>
+#else
+ #error 'stdlib.h not found'
+#endif
+
+#if defined HAVE_STRING_H
+ #include <string.h>
+#else
+ #error 'string.h not found'
+#endif
+
+#if defined HAVE_DLFCN_H
+ #include <dlfcn.h>
+#else
+ #error 'dlfcn.h not found'
+#endif
-#include "config.h"
#include "org_apache_hadoop_io_compress_snappy.h"
#include "org_apache_hadoop_io_compress_snappy_SnappyCompressor.h"
@@ -99,3 +123,5 @@ JNIEXPORT jint JNICALL Java_org_apache_h
return (jint)compressed_direct_buf_len;
}
+
+#endif //define HADOOP_SNAPPY_LIBRARY
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c?rev=1347738&r1=1347737&r2=1347738&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
Thu Jun 7 17:56:04 2012
@@ -16,12 +16,36 @@
* limitations under the License.
*/
-#include <dlfcn.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#if defined HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
+#if defined HADOOP_SNAPPY_LIBRARY
+
+#if defined HAVE_STDIO_H
+ #include <stdio.h>
+#else
+ #error 'stdio.h not found'
+#endif
+
+#if defined HAVE_STDLIB_H
+ #include <stdlib.h>
+#else
+ #error 'stdlib.h not found'
+#endif
+
+#if defined HAVE_STRING_H
+ #include <string.h>
+#else
+ #error 'string.h not found'
+#endif
+
+#if defined HAVE_DLFCN_H
+ #include <dlfcn.h>
+#else
+ #error 'dlfcn.h not found'
+#endif
-#include "config.h"
#include "org_apache_hadoop_io_compress_snappy.h"
#include "org_apache_hadoop_io_compress_snappy_SnappyDecompressor.h"
@@ -103,3 +127,5 @@ JNIEXPORT jint JNICALL Java_org_apache_h
return (jint)uncompressed_direct_buf_len;
}
+
+#endif //define HADOOP_SNAPPY_LIBRARY
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy.h
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy.h?rev=1347738&r1=1347737&r2=1347738&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy.h
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy.h
Thu Jun 7 17:56:04 2012
@@ -17,13 +17,42 @@
*/
-#ifndef ORG_APACHE_HADOOP_IO_COMPRESS_SNAPPY_SNAPPY_H
+#if !defined ORG_APACHE_HADOOP_IO_COMPRESS_SNAPPY_SNAPPY_H
#define ORG_APACHE_HADOOP_IO_COMPRESS_SNAPPY_SNAPPY_H
-#include "org_apache_hadoop.h"
-#include <dlfcn.h>
-#include <jni.h>
-#include <snappy-c.h>
-#include <stddef.h>
+
+#if defined HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
+#if defined HADOOP_SNAPPY_LIBRARY
+
+ #if defined HAVE_STDDEF_H
+ #include <stddef.h>
+ #else
+ #error 'stddef.h not found'
+ #endif
+
+ #if defined HAVE_SNAPPY_C_H
+ #include <snappy-c.h>
+ #else
+ #error 'Please install snappy-development packages for your platform.'
+ #endif
+
+ #if defined HAVE_DLFCN_H
+ #include <dlfcn.h>
+ #else
+ #error "dlfcn.h not found"
+ #endif
+
+ #if defined HAVE_JNI_H
+ #include <jni.h>
+ #else
+ #error 'jni.h not found'
+ #endif
+
+ #include "org_apache_hadoop.h"
+
+#endif //define HADOOP_SNAPPY_LIBRARY
#endif //ORG_APACHE_HADOOP_IO_COMPRESS_SNAPPY_SNAPPY_H
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c?rev=1347738&r1=1347737&r2=1347738&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c
Thu Jun 7 17:56:04 2012
@@ -16,12 +16,34 @@
* limitations under the License.
*/
-#include <dlfcn.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#if defined HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
+#if defined HAVE_STDIO_H
+ #include <stdio.h>
+#else
+ #error 'stdio.h not found'
+#endif
+
+#if defined HAVE_STDLIB_H
+ #include <stdlib.h>
+#else
+ #error 'stdlib.h not found'
+#endif
+
+#if defined HAVE_STRING_H
+ #include <string.h>
+#else
+ #error 'string.h not found'
+#endif
+
+#if defined HAVE_DLFCN_H
+ #include <dlfcn.h>
+#else
+ #error 'dlfcn.h not found'
+#endif
-#include "config.h"
#include "org_apache_hadoop_io_compress_zlib.h"
#include "org_apache_hadoop_io_compress_zlib_ZlibCompressor.h"
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c?rev=1347738&r1=1347737&r2=1347738&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c
Thu Jun 7 17:56:04 2012
@@ -16,12 +16,34 @@
* limitations under the License.
*/
-#include <dlfcn.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#if defined HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
+#if defined HAVE_STDIO_H
+ #include <stdio.h>
+#else
+ #error 'stdio.h not found'
+#endif
+
+#if defined HAVE_STDLIB_H
+ #include <stdlib.h>
+#else
+ #error 'stdlib.h not found'
+#endif
+
+#if defined HAVE_STRING_H
+ #include <string.h>
+#else
+ #error 'string.h not found'
+#endif
+
+#if defined HAVE_DLFCN_H
+ #include <dlfcn.h>
+#else
+ #error 'dlfcn.h not found'
+#endif
-#include "config.h"
#include "org_apache_hadoop_io_compress_zlib.h"
#include "org_apache_hadoop_io_compress_zlib_ZlibDecompressor.h"
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/org_apache_hadoop_io_compress_zlib.h
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/org_apache_hadoop_io_compress_zlib.h?rev=1347738&r1=1347737&r2=1347738&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/org_apache_hadoop_io_compress_zlib.h
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zlib/org_apache_hadoop_io_compress_zlib.h
Thu Jun 7 17:56:04 2012
@@ -19,13 +19,40 @@
#if !defined ORG_APACHE_HADOOP_IO_COMPRESS_ZLIB_ZLIB_H
#define ORG_APACHE_HADOOP_IO_COMPRESS_ZLIB_ZLIB_H
-#include <dlfcn.h>
-#include <jni.h>
-#include <stddef.h>
-#include <zconf.h>
-#include <zlib.h>
+#if defined HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
+#if defined HAVE_STDDEF_H
+ #include <stddef.h>
+#else
+ #error 'stddef.h not found'
+#endif
+
+#if defined HAVE_ZLIB_H
+ #include <zlib.h>
+#else
+ #error 'Please install zlib-development packages for your platform.'
+#endif
+
+#if defined HAVE_ZCONF_H
+ #include <zconf.h>
+#else
+ #error 'Please install zlib-development packages for your platform.'
+#endif
+
+#if defined HAVE_DLFCN_H
+ #include <dlfcn.h>
+#else
+ #error "dlfcn.h not found"
+#endif
+
+#if defined HAVE_JNI_H
+ #include <jni.h>
+#else
+ #error 'jni.h not found'
+#endif
-#include "config.h"
#include "org_apache_hadoop.h"
/* A helper macro to convert the java 'stream-handle' to a z_stream pointer. */
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c?rev=1347738&r1=1347737&r2=1347738&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
Thu Jun 7 17:56:04 2012
@@ -16,6 +16,9 @@
* limitations under the License.
*/
+// get the autoconf settings
+#include "config.h"
+
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
@@ -29,7 +32,6 @@
#include <sys/syscall.h>
#include <unistd.h>
-#include "config.h"
#include "org_apache_hadoop.h"
#include "org_apache_hadoop_io_nativeio_NativeIO.h"
#include "file_descriptor.h"
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/util/NativeCrc32.c
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/util/NativeCrc32.c?rev=1347738&r1=1347737&r2=1347738&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/util/NativeCrc32.c
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/util/NativeCrc32.c
Thu Jun 7 17:56:04 2012
@@ -16,6 +16,9 @@
* limitations under the License.
*/
+// get the autoconf settings
+#include "config.h"
+
#include <arpa/inet.h>
#include <assert.h>
#include <stdlib.h>
@@ -23,7 +26,6 @@
#include <string.h>
#include <unistd.h>
-#include "config.h"
#include "org_apache_hadoop.h"
#include "org_apache_hadoop_util_NativeCrc32.h"
#include "gcc_optimizations.h"
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org_apache_hadoop.h
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org_apache_hadoop.h?rev=1347738&r1=1347737&r2=1347738&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org_apache_hadoop.h
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org_apache_hadoop.h
Thu Jun 7 17:56:04 2012
@@ -24,10 +24,21 @@
#if !defined ORG_APACHE_HADOOP_H
#define ORG_APACHE_HADOOP_H
-#include <dlfcn.h>
-#include <jni.h>
+#if defined HAVE_CONFIG_H
+ #include <config.h>
+#endif
-#include "config.h"
+#if defined HAVE_DLFCN_H
+ #include <dlfcn.h>
+#else
+ #error "dlfcn.h not found"
+#endif
+
+#if defined HAVE_JNI_H
+ #include <jni.h>
+#else
+ #error 'jni.h not found'
+#endif
/* A helper macro to 'throw' a java exception. */
#define THROW(env, exception_name, message) \
