You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dd...@apache.org on 2010/12/01 09:07:13 UTC
svn commit: r1040884 [3/3] - in /hadoop/common/branches/branch-0.22: ./
src/java/org/apache/hadoop/io/ src/java/org/apache/hadoop/io/nativeio/
src/native/ src/native/lib/ src/native/src/
src/native/src/org/apache/hadoop/io/nativeio/ src/test/core/org/a...
Modified: hadoop/common/branches/branch-0.22/src/native/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/native/configure.ac?rev=1040884&r1=1040883&r2=1040884&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/native/configure.ac (original)
+++ hadoop/common/branches/branch-0.22/src/native/configure.ac Wed Dec 1 08:07:12 2010
@@ -38,6 +38,7 @@ AC_INIT(src/org_apache_hadoop.h)
AC_CONFIG_SRCDIR([src/org_apache_hadoop.h])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_HEADER([config.h])
+AC_SYS_LARGEFILE
AM_INIT_AUTOMAKE(hadoop,1.0.0)
@@ -95,6 +96,9 @@ AC_C_CONST
# Checks for library functions.
AC_CHECK_FUNCS([memset])
+# Check for nonstandard STRERROR_R
+AC_FUNC_STRERROR_R
+
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
Modified: hadoop/common/branches/branch-0.22/src/native/lib/Makefile.am
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/native/lib/Makefile.am?rev=1040884&r1=1040883&r2=1040884&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/native/lib/Makefile.am (original)
+++ hadoop/common/branches/branch-0.22/src/native/lib/Makefile.am Wed Dec 1 08:07:12 2010
@@ -36,7 +36,7 @@ AM_LDFLAGS = @JNI_LDFLAGS@ -m$(JVM_DATA_
lib_LTLIBRARIES = libhadoop.la
libhadoop_la_SOURCES =
-libhadoop_la_LDFLAGS = -version-info 1:0:0
+libhadoop_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS)
libhadoop_la_LIBADD = $(HADOOP_OBJS) -ldl -ljvm
#
Modified: hadoop/common/branches/branch-0.22/src/native/src/org_apache_hadoop.h
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/native/src/org_apache_hadoop.h?rev=1040884&r1=1040883&r2=1040884&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/native/src/org_apache_hadoop.h (original)
+++ hadoop/common/branches/branch-0.22/src/native/src/org_apache_hadoop.h Wed Dec 1 08:07:12 2010
@@ -50,6 +50,22 @@
} \
}
+/* Helper macro to return if an exception is pending */
+#define PASS_EXCEPTIONS(env) \
+ { \
+ if ((*env)->ExceptionCheck(env)) return; \
+ }
+
+#define PASS_EXCEPTIONS_GOTO(env, target) \
+ { \
+ if ((*env)->ExceptionCheck(env)) goto target; \
+ }
+
+#define PASS_EXCEPTIONS_RET(env, ret) \
+ { \
+ if ((*env)->ExceptionCheck(env)) return (ret); \
+ }
+
/**
* A helper function to dlsym a 'symbol' from a given library-handle.
*