[sword-svn] r2514 - in trunk: bindings/java-jni/jni include

[scribe at crosswire.org]

Author: scribe
Date: 2010-04-16 23:51:27 -0700 (Fri, 16 Apr 2010)
New Revision: 2514

Modified:
   trunk/bindings/java-jni/jni/Android.mk
   trunk/include/sysdata.h
Log:
Latest android updates


Modified: trunk/bindings/java-jni/jni/Android.mk
===================================================================
--- trunk/bindings/java-jni/jni/Android.mk	2010-04-05 07:07:23 UTC (rev 2513)
+++ trunk/bindings/java-jni/jni/Android.mk	2010-04-17 06:51:27 UTC (rev 2514)
@@ -25,14 +25,9 @@
 #
 include $(CLEAR_VARS)
 
-STLPORT_BASE	:= $(NDK_WRAPPERS_BASE)/stlport
-
 LOCAL_MODULE    := libswordcore
-LOCAL_C_INCLUDES := ../sword/include
-LOCAL_CFLAGS	+= -I$(STLPORT_BASE)/stlport \
-		   -D__NEW__ \
-		   -D__unix__ \
-		   -D__SGI_STL_INTERNAL_PAIR_H \
+LOCAL_C_INCLUDES := ../src/sword/include ../src/sword/include/internal/regex
+LOCAL_CFLAGS	+= -D__unix__ \
 		   -D_FTPLIB_NO_COMPAT \
 		   -DANDROID \
 		   -DOS_ANDROID
@@ -188,18 +183,14 @@
 #
 include $(CLEAR_VARS)
 
-STLPORT_BASE	:= $(NDK_WRAPPERS_BASE)/stlport
-
 LOCAL_MODULE    := libsword
-LOCAL_C_INCLUDES := ../sword/include
-LOCAL_CFLAGS	+= -I$(STLPORT_BASE)/stlport \
-		   -D__NEW__ \
-		   -D__SGI_STL_INTERNAL_PAIR_H \
+LOCAL_C_INCLUDES := ../src/sword/include ../src/sword/include/internal/regex
+LOCAL_CFLAGS	+= -D__unix__ \
+		   -D_FTPLIB_NO_COMPAT \
 		   -DANDROID \
 		   -DOS_ANDROID
 
-LOCAL_LDLIBS	+= -L$(STLPORT_BASE)/build/lib/obj/arm-linux-gcc/so \
-		   -lstlport -lz -llog
+LOCAL_LDLIBS	+= -lz -llog
 
 LOCAL_SRC_FILES := swordstub.cpp
 

Modified: trunk/include/sysdata.h
===================================================================
--- trunk/include/sysdata.h	2010-04-05 07:07:23 UTC (rev 2513)
+++ trunk/include/sysdata.h	2010-04-17 06:51:27 UTC (rev 2514)
@@ -23,17 +23,17 @@
 //typedef unsigned long long __u64;
 #endif
 
-#undef __swap16
-#undef __swap32
-#undef __swap64
+#undef __swswap16
+#undef __swswap32
+#undef __swswap64
 
-#define __swap16(x) \
+#define __swswap16(x) \
 	((__u16)( \
 		(((__u16)(x) & (__u16)0x00ffU) << 8) | \
 		(((__u16)(x) & (__u16)0xff00U) >> 8) ))
 
 		
-#define __swap32(x) \
+#define __swswap32(x) \
 	((__u32)( \
 		(((__u32)(x) & (__u32)0x000000ffUL) << 24) | \
 		(((__u32)(x) & (__u32)0x0000ff00UL) <<  8) | \
@@ -41,7 +41,7 @@
 		(((__u32)(x) & (__u32)0xff000000UL) >> 24) ))
 
 		
-#define __swap64(x) \
+#define __swswap64(x) \
 	((__u64)( \
 		(__u64)(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \
 		(__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \
@@ -66,12 +66,12 @@
 
 #else 
 
-#define swordtoarch16(x) __swap16(x)
-#define swordtoarch32(x) __swap32(x)
-#define swordtoarch64(x) __swap64(x)
-#define archtosword16(x) __swap16(x)
-#define archtosword32(x) __swap32(x)
-#define archtosword64(x) __swap64(x)
+#define swordtoarch16(x) __swswap16(x)
+#define swordtoarch32(x) __swswap32(x)
+#define swordtoarch64(x) __swswap64(x)
+#define archtosword16(x) __swswap16(x)
+#define archtosword32(x) __swswap32(x)
+#define archtosword64(x) __swswap64(x)
 
 
 #endif