summaryrefslogtreecommitdiff
path: root/FreeRTOS-Plus
diff options
context:
space:
mode:
authorrtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>2015-10-17 17:25:50 +0000
committerrtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>2015-10-17 17:25:50 +0000
commitf91a0459c111212abe60be881aeeaa6b7a302ac5 (patch)
tree36416ad6a31b0c066641117583eb967a93dda13b /FreeRTOS-Plus
parent2840ed0c811cbccd9ce589f20b7fadfed8fe951b (diff)
downloadfreertos-f91a0459c111212abe60be881aeeaa6b7a302ac5.tar.gz
Final tidy up before tagging V8.2.3.
git-svn-id: http://svn.code.sf.net/p/freertos/code/trunk@2391 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
Diffstat (limited to 'FreeRTOS-Plus')
-rw-r--r--FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WinPCap/pcap-stdinc.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WinPCap/pcap-stdinc.h b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WinPCap/pcap-stdinc.h
index f1ea03f04..ded432579 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WinPCap/pcap-stdinc.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WinPCap/pcap-stdinc.h
@@ -39,14 +39,13 @@
#endif
/*
- * Avoids a compiler warning in case this was already defined
+ * Avoids a compiler warning in case this was already defined
* (someone defined _WINSOCKAPI_ when including 'windows.h', in order
* to prevent it from including 'winsock.h')
*/
#ifdef _WINSOCKAPI_
#undef _WINSOCKAPI_
#endif
-//_RB_#include <winsock2.h>
#include <fcntl.h>
@@ -66,7 +65,7 @@
#define strdup _strdup
#endif
-#define inline __inline
+#define inline __inline
#ifdef __MINGW32__
#include <stdint.h>
@@ -88,6 +87,6 @@ typedef __int64 intptr_t;
typedef _W64 int intptr_t;
#endif
#define _INTPTR_T_DEFINED
-#endif
+#endif
#endif /*__MINGW32__*/