Merge branch 'master' of github.com:cyassl/cyassl

2012-10-17 13:14:34 -07:00 · 2012-10-17 13:14:34 -07:00 · 454bfa4abd
commit 454bfa4abd
parent fe632a3f77 ef47f1a25e
2 changed files with 3 additions and 1 deletions
--- a/cyassl/ctaocrypt/settings.h
+++ b/cyassl/ctaocrypt/settings.h
@ -150,6 +150,7 @@
 #endif

 #ifdef CYASSL_LSR
+    #define HAVE_WEBSERVER
    #define SIZEOF_LONG_LONG 8
    #define CYASSL_LOW_MEMORY
    #define NO_WRITEV
--- a/cyassl/ctaocrypt/types.h
+++ b/cyassl/ctaocrypt/types.h
@ -221,7 +221,8 @@ enum {
    DYNAMIC_TYPE_RNG          = 32,
    DYNAMIC_TYPE_ARRAYS       = 33,
    DYNAMIC_TYPE_DTLS_POOL    = 34,
-    DYNAMIC_TYPE_SOCKADDR     = 35
+    DYNAMIC_TYPE_SOCKADDR     = 35,
+    DYNAMIC_TYPE_LIBZ         = 36
 };

 /* stack protection */