Changes for Zfone on Windows x64

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

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

include/zrtp_config_win.h

@@ -13,6 +13,10 @@
 #define	_CRT_SECURE_NO_WARNINGS	1
 #pragma	warning(disable: 4068)
 
+#if !(defined(__BUILDMACHINE__) && __BUILDMACHINE__ == WinDDK)
+#include <Windows.h>
+#endif
+
 /*
  * Used to map system integer types to zrtp integer definitions.
  * Define to 1 if you have the <inttypes.h> header file.

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,6 +58,7 @@ 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);
 
@@ -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.
@@ -125,6 +127,8 @@ void zrtp_def_cache_foreach( zrtp_global_t *global,
 							 zrtp_cache_callback_t callback,
 							 void *data);
 	
+#endif /* ZRTP_USE_BUILTIN_CACHE */
+
 /**
  * @brief Store shared secrets cache to the persistent storage
  * May be used in server solutions for periodically flushing the cache to prevent data loss.
@@ -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__*/