From 0b23180ae7f17f6e1ae3b6e573e2860cd1f7e229 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Mon, 11 Feb 2013 12:48:36 +0800
Subject: [PATCH] update spdylay

---
 jni/Android.mk            |  2 +-
 jni/spdylay/spdylay_net.h | 14 --------------
 res/values/strings.xml    |  4 ++--
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 33faec2..ce32c77 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -76,7 +76,7 @@ LOCAL_STATIC_LIBRARIES := libevent libcrypto
 
 LOCAL_MODULE := spdylay
 LOCAL_SRC_FILES := $(addprefix spdylay/, $(SPDYLAY_SOURCES))
-LOCAL_CFLAGS := -O2 -g -I$(LOCAL_PATH)/spdylay \
+LOCAL_CFLAGS := -DHAVE_CONFIG_H -O2 -g -I$(LOCAL_PATH)/spdylay \
 	-I$(LOCAL_PATH)/spdylay/includes \
 	-I$(LOCAL_PATH)/libevent/include \
 	-I$(LOCAL_PATH)/libevent \
diff --git a/jni/spdylay/spdylay_net.h b/jni/spdylay/spdylay_net.h
index ed08000..45a1491 100644
--- a/jni/spdylay/spdylay_net.h
+++ b/jni/spdylay/spdylay_net.h
@@ -25,20 +25,6 @@
 #ifndef SPDYLAY_NET_H
 #define SPDYLAY_NET_H
 
-# if __BYTE_ORDER == __BIG_ENDIAN
-# define ntohl(x) (x)
-# define ntohs(x) (x)
-# define htonl(x) (x)
-# define htons(x) (x)
-# else
-#  if __BYTE_ORDER == __LITTLE_ENDIAN
-#   define ntohl(x) __bswap_32 (x)
-#   define ntohs(x) __bswap_16 (x)
-#   define htonl(x) __bswap_32 (x)
-#   define htons(x) __bswap_16 (x)
-#  endif
-# endif
-
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif /* HAVE_CONFIG_H */
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f060b61..79939d4 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -96,7 +96,7 @@
     <string name="proxyed_help">Select apps to use with ProxyDroid:</string>
 
     <!-- menu bar category -->
-    <string name="recovery">Recover</string>
+    <string name="recovery">Reset</string>
     <string name="copy_rights">\n\nProxyDroid is an open source software
 		published
 		under
@@ -182,4 +182,4 @@
     <string name="msg_pac_error">Incorrect or unsupported PAC file</string>
     <string name="msg_resolve_error">Incorrect or unknown proxy host name</string>
 
-</resources>
\ No newline at end of file
+</resources>