Author: mturk
Date: Mon Jul 18 11:29:55 2011
New Revision: 1147814
URL: http://svn.apache.org/viewvc?rev=1147814&view=rev
Log:
Fix configure include and gcc checking
Modified:
commons/sandbox/runtime/trunk/src/main/native/configure
commons/sandbox/runtime/trunk/src/main/native/os/unix/posixapi.c
Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=1147814&r1=1147813&r2=1147814&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Mon Jul 18 11:29:55
2011
@@ -669,7 +669,7 @@ case "$host-$cctype" in
echo "Error: Cannot determine $cc version"
exit 1
fi
- cc_ver_major=`echo "$v" | awk '{print $2;}'`
+ cc_ver_minor=`echo "$v" | awk '{print $2;}'`
if [ ".$has_maintainer_mode" != .yes ]; then
varadds ccflags -fno-stack-protector
else
@@ -677,7 +677,7 @@ case "$host-$cctype" in
varadds asflags -g
fi
if [ ${cc_ver_major}${cc_ver_minor}0 -lt 410 ]; then
- echo "Error: Detected $cc version"
+ echo "Error: Detected $cc version: \`$v'"
echo " gcc >= 4.1.0 required"
exit 1
fi
@@ -915,8 +915,8 @@ have_include()
do_printf 'Checking for %-32s' "<$1.h>"
cat > $cccsrc.c << EOF
#include <stdlib.h>
-#include <$cccinc.h>
-$3
+#include <sys/types.h>
+$2
#include <$1.h>
int main() {return 0;}
EOF
Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/posixapi.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/posixapi.c?rev=1147814&r1=1147813&r2=1147814&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/posixapi.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/posixapi.c Mon Jul 18
11:29:55 2011
@@ -21,7 +21,7 @@
#include <sys/mman.h>
#if !defined(MAP_ANONYMOUS)
-# define MAP_ANONYMOUS MAP_ANON
+# define MAP_ANONYMOUS MAP_ANON
#endif
ACR_UNX_EXPORT(jint, Posix, open)(JNI_STDARGS, jstring name,
