4 files changed, 2 insertions, 6 deletions
diff --git a/include/config-netware.h b/include/config-netware.h
index f287699249b..f7f494b519c 100644
--- a/include/config-netware.h
+++ b/include/config-netware.h
@@ -112,9 +112,6 @@ extern "C" {
 /* signal by closing the sockets */
 #define SIGNAL_WITH_VIO_CLOSE 1
 
-/* On NetWare, stack grows towards lower address*/
-#define STACK_DIRECTION -1
-
 /* On NetWare, we need to set stack size for threads, otherwise default 16K is used */
 #define NW_THD_STACKSIZE 65536
 
diff --git a/include/config-win.h b/include/config-win.h
index bc2ae60f137..fa5c15b0668 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -250,8 +250,6 @@ inline double ulonglong2double(ulonglong value)
 #endif
 
 
-#define STACK_DIRECTION -1
-
 /* Optimized store functions for Intel x86 */
 
 #ifndef _WIN64
diff --git a/include/keycache.h b/include/keycache.h
index 9ebb7d5b992..7f4ce86cea0 100644
--- a/include/keycache.h
+++ b/include/keycache.h
@@ -47,7 +47,6 @@ typedef struct st_key_cache
   my_bool in_resize;             /* true during resize operation             */
   my_bool resize_in_flush;       /* true during flush of resize operation    */
   my_bool can_be_used;           /* usage of cache for read/write is allowed */
-  uint key_cache_shift;
   ulong key_cache_mem_size;      /* specified size of the cache memory       */
   uint key_cache_block_size;     /* size of the page buffer of a cache block */
   ulong min_warm_blocks;         /* min number of warm blocks;               */
diff --git a/include/violite.h b/include/violite.h
index 30796b13240..d49d0302b5e 100644
--- a/include/violite.h
+++ b/include/violite.h
@@ -100,7 +100,9 @@ my_bool	vio_poll_read(Vio *vio,uint timeout);
 
 #define HEADER_DES_LOCL_H dummy_something
 #define YASSL_MYSQL_COMPATIBLE
+#ifndef YASSL_PREFIX
 #define YASSL_PREFIX
+#endif
 /* Set yaSSL to use same type as MySQL do for socket handles */
 typedef my_socket YASSL_SOCKET_T;
 #define YASSL_SOCKET_T_DEFINED