Changes for Zfone on Windows x64

diff --git a/include/zrtp_config.h b/include/zrtp_config.h
index ca002d8c430eb28009c565c4a6b2646843dee64e..0b67868fd907cba2fbf82f9b105c0d84951b8735 100644 (file)
--- a/include/zrtp_config.h
+++ b/include/zrtp_config.h
@@ -30,6 +30,8 @@
 #      elif defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(WIN32) || defined(__TOS_WIN__)
 #              if defined(__BUILDMACHINE__) && (__BUILDMACHINE__ == WinDDK)
 #                      define ZRTP_PLATFORM ZP_WIN32_KERNEL
+#              elif defined(_WIN64)
+#                      define ZRTP_PLATFORM ZP_WIN32
 #              else
 #                      define ZRTP_PLATFORM ZP_WIN32
 #              endif

diff --git a/include/zrtp_config_user.h b/include/zrtp_config_user.h
index 707349ed1cc3f9a8d4cd8f6c6a98e1252a98506d..b9d361bdc2b47505211ed4ed914a2d8a426836e7 100644 (file)
--- a/include/zrtp_config_user.h
+++ b/include/zrtp_config_user.h
@@ -110,7 +110,15 @@
 #endif
 
 #ifndef ZRTP_USE_BUILTIN_CACHE
-#define ZRTP_USE_BUILTIN_CACHE         1
+#      if defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(WIN32) || defined(__TOS_WIN__)
+#              if defined(__BUILDMACHINE__) && (__BUILDMACHINE__ == WinDDK)
+#                      define ZRTP_USE_BUILTIN_CACHE           1
+#              else
+#                      define ZRTP_USE_BUILTIN_CACHE           0
+#              endif
+#      else
+#              define ZRTP_USE_BUILTIN_CACHE           1
+#      endif
 #endif
 
 #ifndef ZRTP_ENABLE_EC

diff --git a/include/zrtp_config_win.h b/include/zrtp_config_win.h
index 16e49f833ff45b029310aa4e823412d8f72226ef..23a53e95073a6b3181c2fa1885af9500a2757ec5 100644 (file)
--- a/include/zrtp_config_win.h
+++ b/include/zrtp_config_win.h
@@ -1,70 +1,74 @@
-/*
- * libZRTP SDK library, implements the ZRTP secure VoIP protocol.
- * Copyright (c) 2006-2009 Philip R. Zimmermann.  All rights reserved.
- * Contact: http://philzimmermann.com
- * For licensing and other legal details, see the file zrtp_legal.c.
- * 
- * Viktor Krykun <v.krikun at zfoneproject.com> 
- */
-
-#ifndef ZRTP_WIN_CONFIG_H__
-#define ZRTP_WIN_CONFIG_H__
-
+/*\r
+ * libZRTP SDK library, implements the ZRTP secure VoIP protocol.\r
+ * Copyright (c) 2006-2009 Philip R. Zimmermann.  All rights reserved.\r
+ * Contact: http://philzimmermann.com\r
+ * For licensing and other legal details, see the file zrtp_legal.c.\r
+ * \r
+ * Viktor Krykun <v.krikun at zfoneproject.com> \r
+ */\r
+\r
+#ifndef ZRTP_WIN_CONFIG_H__\r
+#define ZRTP_WIN_CONFIG_H__\r
+\r
 #define        _CRT_SECURE_NO_WARNINGS 1\r
 #pragma        warning(disable: 4068)\r
-
-/*
- * Used to map system integer types to zrtp integer definitions.
- * Define to 1 if you have the <inttypes.h> header file.
- */
-#undef ZRTP_HAVE_INTTYPES_H
-
-#define ZRTP_HAVE_STRING_H     1
-
-/*
- * This header is needed for operations with binary file in deefault realization
- * of the secrets' cache. Can be eliminated if default cache isn't used.
- * Define to 1 if you have the <stdio.h> header file.
- */
-#ifndef ZRTP_HAVE_STDIO_H
-#      define ZRTP_HAVE_STDIO_H 1
-#endif
-
-#ifndef ZRTP_HAVE_STDARG_H
-#      define ZRTP_HAVE_STDARG_H 1
-#endif
-
-/*
- * Used by bnlib, but we don't need this on Windows platform.
- */
-#ifndef NO_ASSERT_H
-       #define NO_ASSERT_H 1
-#endif
-
-/*
- * Used by bnlib. We have stdlib in any Windows platform - set it to 1.
- */
-#ifndef NO_STDLIB_H
-       #define NO_STDLIB_H 0
-#endif
-
-
-#define ZRTP_HAVE_INT64_T 0
-#define ZRTP_HAVE_INT32_T 0
-#define ZRTP_HAVE_INT16_T 0
-#define ZRTP_HAVE_INT8_T  0
-
-#define ZRTP_HAVE_UINT64_T 0
-#define ZRTP_HAVE_UINT32_T 0
-#define ZRTP_HAVE_UINT16_T 0
-#define ZRTP_HAVE_UINT8_T  0
-
-#define SIZEOF_UNSIGNED_LONG 4
-#define SIZEOF_UNSIGNED_LONG_LONG 8
-
-#define ZRTP_INLINE static __inline
-
-#define ZRTP_VERSION   "0.90"
-
-
-#endif /* ZRTP_WIN_CONFIG_H__ */
+\r
+#if !(defined(__BUILDMACHINE__) && __BUILDMACHINE__ == WinDDK)\r
+#include <Windows.h>\r
+#endif\r
+\r
+/*\r
+ * Used to map system integer types to zrtp integer definitions.\r
+ * Define to 1 if you have the <inttypes.h> header file.\r
+ */\r
+#undef ZRTP_HAVE_INTTYPES_H\r
+\r
+#define ZRTP_HAVE_STRING_H     1\r
+\r
+/*\r
+ * This header is needed for operations with binary file in deefault realization\r
+ * of the secrets' cache. Can be eliminated if default cache isn't used.\r
+ * Define to 1 if you have the <stdio.h> header file.\r
+ */\r
+#ifndef ZRTP_HAVE_STDIO_H\r
+#      define ZRTP_HAVE_STDIO_H 1\r
+#endif\r
+\r
+#ifndef ZRTP_HAVE_STDARG_H\r
+#      define ZRTP_HAVE_STDARG_H 1\r
+#endif\r
+\r
+/*\r
+ * Used by bnlib, but we don't need this on Windows platform.\r
+ */\r
+#ifndef NO_ASSERT_H\r
+       #define NO_ASSERT_H 1\r
+#endif\r
+\r
+/*\r
+ * Used by bnlib. We have stdlib in any Windows platform - set it to 1.\r
+ */\r
+#ifndef NO_STDLIB_H\r
+       #define NO_STDLIB_H 0\r
+#endif\r
+\r
+\r
+#define ZRTP_HAVE_INT64_T 0\r
+#define ZRTP_HAVE_INT32_T 0\r
+#define ZRTP_HAVE_INT16_T 0\r
+#define ZRTP_HAVE_INT8_T  0\r
+\r
+#define ZRTP_HAVE_UINT64_T 0\r
+#define ZRTP_HAVE_UINT32_T 0\r
+#define ZRTP_HAVE_UINT16_T 0\r
+#define ZRTP_HAVE_UINT8_T  0\r
+\r
+#define SIZEOF_UNSIGNED_LONG 4\r
+#define SIZEOF_UNSIGNED_LONG_LONG 8\r
+\r
+#define ZRTP_INLINE static __inline\r
+\r
+#define ZRTP_VERSION   "0.90"\r
+\r
+\r
+#endif /* ZRTP_WIN_CONFIG_H__ */\r

diff --git a/include/zrtp_iface_cache.h b/include/zrtp_iface_cache.h
index c401ba9f7ff42e541aa132d4031c3191257dde18..9a60b83496a5bf05fff59f34be7e542aeb399130 100644 (file)
--- a/include/zrtp_iface_cache.h
+++ b/include/zrtp_iface_cache.h
@@ -16,13 +16,13 @@
 #include "zrtp_error.h"
 #include "zrtp_iface.h"
 
-#if defined(ZRTP_USE_BUILTIN_CACHE) && (ZRTP_USE_BUILTIN_CACHE == 1)
-
 #if defined(__cplusplus)
 extern "C"
 {
 #endif
 
+#if defined(ZRTP_USE_BUILTIN_CACHE) && (ZRTP_USE_BUILTIN_CACHE == 1)
+
 #define ZRTP_DEF_CACHE_VERSION_STR     "libZRTP cache version="
 #define ZRTP_DEF_CACHE_VERSION_VAL     "1.0"
        
@@ -58,7 +58,8 @@ typedef struct zrtp_cache_elem
        mlist_t                 _mlist;
 } zrtp_cache_elem_t;
        
-       
+#endif /* ZRTP_USE_BUILTIN_CACHE */
+
 zrtp_status_t zrtp_def_cache_init(zrtp_global_t* zrtp);
 
 void zrtp_def_cache_down();
@@ -97,6 +98,7 @@ zrtp_status_t zrtp_def_cache_get_presh_counter( const zrtp_stringn_t* one_zid,
                                                                                            const zrtp_stringn_t* another_zid,
                                                                                            uint32_t* counter);
        
+#if defined(ZRTP_USE_BUILTIN_CACHE) && (ZRTP_USE_BUILTIN_CACHE == 1)
 /**
  * @brief Cache iterator
  * zrtp_def_cache_foreach() calls this function for every cache entry.
@@ -124,6 +126,8 @@ void zrtp_def_cache_foreach( zrtp_global_t *global,
                                                         int is_mitm,
                                                         zrtp_cache_callback_t callback,
                                                         void *data);
+       
+#endif /* ZRTP_USE_BUILTIN_CACHE */
 
 /**
  * @brief Store shared secrets cache to the persistent storage
@@ -151,14 +155,13 @@ zrtp_status_t zrtp_def_cache_put_name( const zrtp_stringn_t* one_zid,
                                                                           const zrtp_stringn_t* another_zid,
                                                                           const zrtp_stringn_t* name);
        
+#if defined(ZRTP_USE_BUILTIN_CACHE) && (ZRTP_USE_BUILTIN_CACHE == 1)
 zrtp_cache_elem_t* zrtp_def_cache_get2(const zrtp_cache_id_t id, int is_mitm);
-       
+#endif /* ZRTP_USE_BUILTIN_CACHE */
 
 #if defined(__cplusplus)
 }
 #endif
 
-#endif /* ZRTP_USE_BUILTIN_CACHE */
-
 #endif /*__ZRTP_IFACE_CACHE_H__*/