1 files changed, 32 insertions, 12 deletions
diff --git a/Bus/Ivy/IvyStdAfx.h b/Bus/Ivy/IvyStdAfx.h
index a036dd3..4a795f4 100644
--- a/Bus/Ivy/IvyStdAfx.h
+++ b/Bus/Ivy/IvyStdAfx.h
@@ -3,25 +3,24 @@
 //      are changed infrequently
 //
 
-#if !defined(AFX_STDAFX_H__EE0269AE_DB02_11D2_89CA_00A0245B298A__INCLUDED_)
-#define AFX_STDAFX_H__EE0269AE_DB02_11D2_89CA_00A0245B298A__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 #ifdef WIN32
 
 #pragma warning (disable : 4786)
 #pragma warning( disable : 4275 )	// non dll-interface class 'X' used as base for dll-interface class 'Y'
 #pragma warning( disable : 4251 )	// 'm' : class 'X' needs to have dll-interface to be used by clients of class 'Y'
+#include <crtdbg.h>
 
 #endif
+#include <winsock2.h>
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <assert.h>
+#include <string.h>
 
-#include <winsock2.h>
+//#include <assert.h>
+#ifdef _WINSOCK2API_
 // Some definition missing from winsock2
 /*
  * Options for use with [gs]etsockopt at the IP level.
@@ -42,24 +41,45 @@ struct ip_mreq {
         struct in_addr  imr_multiaddr;  /* IP multicast address of group */
         struct in_addr  imr_interface;  /* local IP address of interface */
 };
+#endif
+
+#ifndef _WIN32_WCE
+#define STL
+#endif
+#ifdef STL
 #include <string>
 #include <vector>
 #include <map>
 #include <list>
 
-typedef std::string String;
+using std::string;
+using std::vector;
+using std::map;
+using std::list;
+#else
+#include "DataTypes.h"
+#endif
 
 //using namespace std;
 
 #ifndef TRACE
 #ifdef WIN32
+
 void DebugTrace ( const char *fmt , ... );
 #define TRACE DebugTrace
 #else
 #define TRACE printf
 #endif
 #endif
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__EE0269AE_DB02_11D2_89CA_00A0245B298A__INCLUDED_)
+#ifndef ASSERT
+#ifdef WIN32
+#define ASSERT(expr) \
+   do { \
+      if (!(expr) && (1 == _CrtDbgReport( \
+          _CRT_ASSERT, __FILE__, __LINE__, "Ivy", #expr))) \
+         _CrtDbgBreak(); \
+    } while (0)
+#else
+#define ASSERT printf
+#endif
+#endif