From 4217ef54753fcf2fe88ce6ded030b25e49244386 Mon Sep 17 00:00:00 2001
From: Takashi Kojo <kojo@wolfsssl.com>
Date: Fri, 27 Nov 2015 11:31:12 +0900
Subject: [PATCH] fixed mdk4 macro control in example server/client,
 echoserver/client

---
 examples/client/client.c         | 7 +++----
 examples/echoclient/echoclient.c | 3 ++-
 examples/echoserver/echoserver.c | 7 +++----
 examples/server/server.c         | 7 ++++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/examples/client/client.c b/examples/client/client.c
index 55874e49e..0dda6a076 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -25,19 +25,18 @@
 
 #include <wolfssl/ssl.h>
 
-#if defined(WOLFSSL_MDK_ARM)
+#if defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET)
         #include <stdio.h>
         #include <string.h>
 
-        #if defined(WOLFSSL_MDK5)
+        #if !defined(WOLFSSL_MDK_ARM)
             #include "cmsis_os.h"
             #include "rl_fs.h"
             #include "rl_net.h"
         #else
             #include "rtl.h"
+            #include "wolfssl_MDK_ARM.h"
         #endif
-
-        #include "wolfssl_MDK_ARM.h"
 #endif
 
 #include <wolfssl/wolfcrypt/settings.h>
diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index 6f06dd82c..37670f20e 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -33,11 +33,12 @@
         #include <stdio.h>
         #include <string.h>
 
-        #if defined(WOLFSSL_MDK5) || defined(WOLFSSL_KEIL_TCP_NET)
+        #if !defined(WOLFSSL_MDK_ARM)
             #include "cmsis_os.h" 
             #include "rl_net.h"
         #else
             #include "rtl.h"
+            #include "wolfssl_MDK_ARM.h"
         #endif
         #if defined(WOLFSSL_MDK_SHELL)
             char * wolfssl_fgets ( char * str, int num, FILE * f ) ;
diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c
index a01377a7f..a0ecae3ff 100644
--- a/examples/echoserver/echoserver.c
+++ b/examples/echoserver/echoserver.c
@@ -29,19 +29,18 @@
     #include <cyassl/ctaocrypt/ecc.h>   /* ecc_fp_free */
 #endif
 
-#if defined(WOLFSSL_MDK_ARM)
+#if defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET)
         #include <stdio.h>
         #include <string.h>
 
-        #if defined(WOLFSSL_MDK5)
+        #if !defined(WOLFSSL_MDK_ARM)
             #include "cmsis_os.h"
             #include "rl_fs.h" 
             #include "rl_net.h" 
         #else
             #include "rtl.h"
+            #include "wolfssl_MDK_ARM.h"
         #endif
-
-        #include "wolfssl_MDK_ARM.h"
 #endif
 
 #include <cyassl/ssl.h>
diff --git a/examples/server/server.c b/examples/server/server.c
index 20c53ab45..a488c8901 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -34,19 +34,20 @@
     #define WOLFSSL_TRACK_MEMORY
 #endif
 
-#if defined(WOLFSSL_MDK_ARM)
+#if defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET)
         #include <stdio.h>
         #include <string.h>
 
-        #if defined(WOLFSSL_MDK5)
+        #if  !defined(WOLFSSL_MDK_ARM)
             #include "cmsis_os.h"
             #include "rl_fs.h"
             #include "rl_net.h"
         #else
             #include "rtl.h"
+            #include "wolfssl_MDK_ARM.h"
         #endif
 
-        #include "wolfssl_MDK_ARM.h"
+
 #endif
 #include <cyassl/openssl/ssl.h>
 #include <cyassl/test.h>