Merge lp:~marcustomlinson/ecspython/fix_float_params into lp:ecspython

[Marcus Tomlinson]

[lp:~marcustomlinson/ecspython/fix_float_params]

12. By Marcus Tomlinson on 2014-12-04

Added support for char* and void* return values

13. By Marcus Tomlinson on 2014-12-04

missing "else"

14. By Marcus Tomlinson on 2014-12-04

Python class functors return a pointer to the C++ class

15. By Marcus Tomlinson on 2014-12-04

code formatting

16. By Marcus Tomlinson on 2014-12-04

Include char* in example

17. By Marcus Tomlinson on 2014-12-04

Fixed Windows stuff

18. By Marcus Tomlinson on 2014-12-05

Allow creation of user class types from Python

19. By Marcus Tomlinson on 2014-12-05

Added readme_windows.txt for Windows users

20. By Marcus Tomlinson on 2014-12-05

Cleaned up example code

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-26 11:00:54 +0000
+++ CMakeLists.txt	2014-12-05 19:42:33 +0000
@@ -1,11 +1,9 @@
 cmake_minimum_required(VERSION 2.8)
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pthread -Wall -Wextra")
+
 project(EcsPython)
 
-add_definitions(
-    -fpermissive
-)
-
 add_subdirectory(example)
 
 if(UNIX)
@@ -13,7 +11,6 @@
 endif(UNIX)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")    
-    add_definitions(-DECS_EXPORT)
     set(PYTHON_LIBRARIES "C:/Python27/libs/python27.lib")
     set(PYTHON_INCLUDE_DIRS "C:/Python27/include")
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")

=== modified file 'example/main.cpp'
--- example/main.cpp	2014-01-25 13:13:29 +0000
+++ example/main.cpp	2014-12-05 19:42:33 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 ECS:Python - Light-Weight C++ Wrapper For Embedding Python Into C++
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of EcsPython.
 
@@ -50,11 +50,17 @@
     return true;
   }
 
-  void ShowLots( unsigned long count, std::string message )
+  float ShowDouble( double message )
+  {
+    std::cout << message;
+    return (float)message;
+  }
+
+  void ShowLots( unsigned long count, char* message )
   {
     for( unsigned int i = 0; i < count; i++ )
     {
-      std::cout << message.c_str();
+      std::cout << message;
     }
     lastMessage = message;
   }
@@ -64,16 +70,43 @@
     return lastMessage;
   }
 
+  void ShowPtr( void* thiz )
+  {
+      ((Simple*)thiz)->Show("Hey! This is coming from a pointer :)");
+  }
+
 private:
   std::string lastMessage;
 };
 
+// Simple Class Factory
+// ====================
+class SimpleFactory
+{
+public:
+    void* NewSimple( std::string firstMessage )
+    {
+        return new Simple( firstMessage );
+    }
+
+    void DeleteSimple( void* simple )
+    {
+        delete ( ( Simple* )simple );
+    }
+};
+
 // Register Classes + Methods
 // ==========================
-ECS_REGISTER_CLASS( Simple );
-ECS_REGISTER_METHOD_RETURN( Simple, Show, bool, std::string );
-ECS_REGISTER_METHOD_VOID( Simple, ShowLots, unsigned long, std::string );
-ECS_REGISTER_METHOD_RETURN( Simple, GetLastMessage, std::string );
+ECS_REGISTER_CLASS( Simple )
+ECS_REGISTER_METHOD_RETURN( Simple, Show, bool, std::string )
+ECS_REGISTER_METHOD_RETURN( Simple, ShowDouble, float, double )
+ECS_REGISTER_METHOD_VOID( Simple, ShowLots, unsigned long, char* )
+ECS_REGISTER_METHOD_RETURN( Simple, GetLastMessage, std::string )
+ECS_REGISTER_METHOD_VOID( Simple, ShowPtr, void* )
+
+ECS_REGISTER_CLASS( SimpleFactory )
+ECS_REGISTER_METHOD_RETURN( SimpleFactory, NewSimple, void*, std::string )
+ECS_REGISTER_METHOD_VOID( SimpleFactory, DeleteSimple, void* )
 
 //=================================================================================================
 
@@ -85,42 +118,66 @@
   // ======================
   Ecs_Init_Simple();
   Ecs_Init_Simple_Show();
+  Ecs_Init_Simple_ShowDouble();
   Ecs_Init_Simple_ShowLots();
   Ecs_Init_Simple_GetLastMessage();
+  Ecs_Init_Simple_ShowPtr();
+
+  Ecs_Init_SimpleFactory();
+  Ecs_Init_SimpleFactory_NewSimple();
+  Ecs_Init_SimpleFactory_DeleteSimple();
 
   // Initialize EcsPython
   // ====================
   Ecs_Initialize();
 
-  // Create New Class Instance
-  // =========================
-  Simple* newSimple = new Simple( "(first message)" );
 
-  // Expose Class Instance To Python
-  // ===============================
-  Ecs_Expose_Object( newSimple, "newSimple" );
+  // Create And Expose Class Instance To Python
+  // ==========================================
+  Simple newSimple( "(first message)" );
+  Ecs_Expose_Object( &newSimple, "newSimple" );
 
   // Use Exposed Class Instance From Python
   // ======================================
   Ecs_Python_Cmd( "print( newSimple.GetLastMessage() )" );
 
+  Ecs_Python_Cmd( "newSimple.Show( 'my favorite number is ' )" );
+  Ecs_Python_Cmd( "newSimple.ShowDouble( 5.9982 )" );
+  Ecs_Python_Cmd( "print('')" );
+
+  Ecs_Python_Cmd( "newSimple.ShowPtr( newSimple() )" );
+  Ecs_Python_Cmd( "print('')" );
+
   Ecs_Python_Cmd( "state = newSimple.Show( 'hello' )" );
-  Ecs_Python_Cmd( "if state == True: \n\t print( ' there,' )" );
+  Ecs_Python_Cmd( "if state == True:\n\tprint( ' there,' )" );
 
   Ecs_Python_Cmd( "newSimple.ShowLots( 5, 'again and ' )" );
 
   Ecs_Python_Cmd( "newSimple.Show( 'once more.' )" );
   Ecs_Python_Cmd( "print('')" );
 
-  // Use Class Instance From C++
-  // ===========================
-  std::cout << newSimple->GetLastMessage().c_str();
-  getchar();
+  // Use The Class Instance From C++
+  // ===============================
+  std::cout << "Ok, " << newSimple.GetLastMessage().c_str() << std::endl;
+
+
+  // Create And Expose Factory To Python
+  // ===================================
+  SimpleFactory simpleFactory;
+  Ecs_Expose_Object( &simpleFactory, "simpleFactory" );
+
+  // Create A New Class Instance From Python
+  // =======================================
+  Ecs_Python_Cmd( "anotherSimple = Simple( simpleFactory.NewSimple( '\\'Allo ' ) )" );
+  Ecs_Python_Cmd( "print( anotherSimple.GetLastMessage() + '\\'Allo!')" );
+  Ecs_Python_Cmd( "simpleFactory.DeleteSimple( anotherSimple() )" );
+
 
   // Finalize EcsPython
   // ==================
   Ecs_Finalize();
 
+  getchar();
   return 0;
 }
 

=== modified file 'include/EcsPython.h'
--- include/EcsPython.h	2014-01-25 13:13:29 +0000
+++ include/EcsPython.h	2014-12-05 19:42:33 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 ECS:Python - Light-Weight C++ Wrapper For Embedding Python Into C++
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of EcsPython.
 
@@ -32,22 +32,8 @@
 #ifndef ECSPYTHON_H
 #define ECSPYTHON_H
 
-#ifdef _WIN32
-
-#ifdef ECS_EXPORT
-  #define DLLPORT __declspec(dllexport)
-#else
-  #define DLLPORT __declspec(dllimport)
-#endif
-
-#else
-
-#define DLLPORT
-
-#endif
-
+#include <dspatch/DspThread.h>
 #include <ecspython/EcsMacros.h>
-#include <dspatch/DspThread.h>
 
 struct PyMethodDef;
 
@@ -55,7 +41,7 @@
 // EcsPython Globals
 // =================
 
-struct DLLEXPORT EcsClass
+struct EcsClass
 {
   EcsClass( std::string newPyClassName, const std::type_info& newPyClassType )
     : pyClassName( newPyClassName ),
@@ -65,7 +51,7 @@
   const std::type_info& pyClassType;
 };
 
-struct DLLEXPORT EcsObject
+struct EcsObject
 {
   EcsObject( char* newPyObject, std::string newPyClassName, std::string newPyObjectName )
     : pyObject( newPyObject ),
@@ -77,54 +63,54 @@
   std::string pyObjectName;
 };
 
-DLLPORT extern DspMutex EcsPythonCmdMutex;											// Mutex for thread-safe python calls
-DLLPORT extern std::vector< EcsClass* > EcsPythonClassesDict;		// C++ class dictionary
-DLLPORT extern std::string EcsPythonClassesDef;									// Python definition string for C++ classes 
-DLLPORT extern std::vector< PyMethodDef > EcsPythonMethods;			// Methods for EcsPython python module
-DLLPORT extern std::vector< EcsObject* > EcsExposedObjects;			// C++ objects exposed to Python
+extern DspMutex EcsPythonCmdMutex;                    // Mutex for thread-safe python calls
+extern std::vector< EcsClass* > EcsPythonClassesDict; // C++ class dictionary
+extern std::string EcsPythonClassesDef;               // Python definition string for C++ classes
+extern std::vector< PyMethodDef > EcsPythonMethods;   // Methods for EcsPython python module
+extern std::vector< EcsObject* > EcsExposedObjects;   // C++ objects exposed to Python
 
 #if PY_MAJOR_VERSION >= 3
-DLLPORT extern struct PyModuleDef EcsPythonModule;							// EcsPython python module
+extern struct PyModuleDef EcsPythonModule; // EcsPython python module
 #endif
 
 //=================================================================================================
 // Initialize EcsPython
 // ====================
 
-DLLEXPORT void Ecs_Initialize();
+void Ecs_Initialize();
 
 //-------------------------------------------------------------------------------------------------
 // Finalize EcsPython
 // ==================
 
-DLLEXPORT void Ecs_Finalize();
+void Ecs_Finalize();
 
 //-------------------------------------------------------------------------------------------------
 // Execute Python Command
 // ======================
 
-DLLEXPORT void Ecs_Python_Cmd( std::string pythonCmdString );
+void Ecs_Python_Cmd( std::string pythonCmdString );
 
 //-------------------------------------------------------------------------------------------------
 // Execute Python File
 // ===================
 
-DLLEXPORT void Ecs_Python_File( std::string pythonScriptPath );
+void Ecs_Python_File( std::string pythonScriptPath );
 
 //-------------------------------------------------------------------------------------------------
 // Get Object Value From Python
 // ============================
 
-DLLEXPORT std::string Ecs_Get_Value( std::string pyObjectName );
+std::string Ecs_Get_Value( std::string pyObjectName );
 
 //-------------------------------------------------------------------------------------------------
 // Expose Class Instance To Python
 // ===============================
 
-DLLEXPORT void _Ecs_Expose_Object( char* pyObject, std::string pyClassName, std::string pyObjectName );
+void _Ecs_Expose_Object( char* pyObject, std::string pyClassName, std::string pyObjectName );
 
 template< class ObjectType >
-DLLEXPORT void Ecs_Expose_Object( ObjectType* object, std::string pyObjectName )
+void Ecs_Expose_Object( ObjectType* object, std::string pyObjectName )
 {
   for( unsigned long i = 0; i < EcsPythonClassesDict.size(); i++ )
   {

=== modified file 'include/dspatch/DspThread.h'
--- include/dspatch/DspThread.h	2014-01-25 10:46:21 +0000
+++ include/dspatch/DspThread.h	2014-12-05 19:42:33 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 

=== modified file 'include/dspatch/DspThreadNull.h'
--- include/dspatch/DspThreadNull.h	2014-01-25 10:46:21 +0000
+++ include/dspatch/DspThreadNull.h	2014-12-05 19:42:33 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -55,7 +55,7 @@
     HighPriority,
     HighestPriority,
 
-    TimeCriticalPriority,
+    TimeCriticalPriority
   };
 
   virtual void Start( Priority priority ) {}

=== modified file 'include/dspatch/DspThreadUnix.h'
--- include/dspatch/DspThreadUnix.h	2014-01-25 10:46:21 +0000
+++ include/dspatch/DspThreadUnix.h	2014-12-05 19:42:33 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -35,7 +35,8 @@
 class DspThread
 {
 public:
-  DspThread() {}
+  DspThread()
+  : _threadAttatched( false ) {}
 
   virtual ~DspThread()
   {
@@ -52,19 +53,24 @@
     HighPriority,
     HighestPriority,
 
-    TimeCriticalPriority,
+    TimeCriticalPriority
   };
 
   virtual void Start( Priority priority = NormalPriority )
   {
     pthread_create( &_thread, NULL, _ThreadFunc, this );
+    _threadAttatched = true;
 
     _SetPriority( _thread, priority );
   }
 
   virtual void Stop()
   {
-    pthread_detach( _thread );
+    if( _threadAttatched )
+    {
+      pthread_detach( _thread );
+      _threadAttatched = false;
+    }
   }
 
   static void SetPriority( Priority priority )
@@ -78,8 +84,6 @@
   }
 
 private:
-  pthread_t _thread;
-
   static void* _ThreadFunc( void* pv )
   {
     ( reinterpret_cast<DspThread*>( pv ) )->_Run();
@@ -100,14 +104,16 @@
 
     pthread_setschedparam( threadID, policy, &param );
   }
+
+private:
+  pthread_t _thread;
+  bool _threadAttatched;
 };
 
 //=================================================================================================
 
 class DspMutex
 {
-  friend class DspWaitCondition;
-
 public:
   DspMutex()
   {
@@ -130,6 +136,8 @@
   }
 
 private:
+  friend class DspWaitCondition;
+
   pthread_mutex_t _mutex;
 };
 

=== modified file 'include/dspatch/DspThreadWin.h'
--- include/dspatch/DspThreadWin.h	2014-01-25 10:46:21 +0000
+++ include/dspatch/DspThreadWin.h	2014-12-05 19:42:33 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -35,10 +35,10 @@
 {
 public:
   DspThread()
-    : _threadHandle( NULL ) {}
+  : _threadHandle( NULL ) {}
 
-  DspThread( const DspThread& )
-    : _threadHandle( NULL ) {}
+  DspThread( DspThread const& )
+  : _threadHandle( NULL ) {}
 
   virtual ~DspThread()
   {
@@ -55,7 +55,7 @@
     HighPriority = 1,
     HighestPriority = 2,
 
-    TimeCriticalPriority = 15,
+    TimeCriticalPriority = 15
   };
 
   virtual void Start( Priority priority = NormalPriority )
@@ -91,6 +91,7 @@
 
   virtual void _Run() = 0;
 
+private:
   HANDLE _threadHandle;
 };
 
@@ -104,7 +105,7 @@
     InitializeCriticalSection( &_cs );
   }
 
-  DspMutex( const DspMutex& )
+  DspMutex( DspMutex const& )
   {
     InitializeCriticalSection( &_cs );
   }
@@ -138,7 +139,7 @@
     _hEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
   }
 
-  DspWaitCondition( const DspWaitCondition& )
+  DspWaitCondition( DspWaitCondition const& )
   {
     _hEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
   }

=== modified file 'include/ecspython/EcsMacros.h'
--- include/ecspython/EcsMacros.h	2014-01-26 12:29:03 +0000
+++ include/ecspython/EcsMacros.h	2014-12-05 19:42:33 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 ECS:Python - Light-Weight C++ Wrapper For Embedding Python Into C++
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of EcsPython.
 
@@ -36,27 +36,25 @@
 #include <typeinfo>
 #include <string>
 
-#include <dspatch/DspThread.h>
-
 //=================================================================================================
 
 typedef struct _object PyObject;
 typedef PyObject* (*PyCFunction)( PyObject *, PyObject * );
 
-DLLPORT extern int (*_Ecs_ParseTuple)( PyObject *, const char *, ... );
+extern int (*_Ecs_ParseTuple)( PyObject *, const char *, ... );
 
 //=================================================================================================
 
-DLLEXPORT void _EcsAddNewMethod( const char *methodName, PyCFunction methodPointer, int methodFlags );
+void _EcsAddNewMethod( const char *methodName, PyCFunction methodPointer, int methodFlags );
 
 //-------------------------------------------------------------------------------------------------
 
 template< class Type >
-DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const Type& Value );
+PyObject* _Ecs_ToPyObject( const Type& Value );
 
 //-------------------------------------------------------------------------------------------------
 
-DLLEXPORT PyObject* _Ecs_GetPythonNull();
+PyObject* _Ecs_GetPythonNull();
 
 //=================================================================================================
 // COMMON TOOLS
@@ -94,15 +92,35 @@
   else if( typeid( Type ) == typeid( bool ) )
     append = "i";
   else if( typeid( Type ) == typeid( double ) )
-    append = "d";
+    append = "f";
   else if( typeid( Type ) == typeid( float ) )
     append = "f";
+  else if( typeid( Type ) == typeid( void* ) )
+    append = "k";
 
   pyTypes.append( append );
 }
 
 //-------------------------------------------------------------------------------------------------
 
+template< class Type >
+void _Ecs_FromPyObject( char* in, Type& out )
+{
+  out = (Type)in;
+}
+
+inline void _Ecs_FromPyObject( char* in, double& out )
+{
+  out = *(float*)&in;
+}
+
+inline void _Ecs_FromPyObject( char* in, float& out )
+{
+  out = *(float*)&in;
+}
+
+//-------------------------------------------------------------------------------------------------
+
 template< class RetT >
 static std::string _Ecs_MakeMethodArgs()
 {
@@ -167,11 +185,11 @@
 static void Ecs_Init##_##Class()\
 {\
   EcsPythonClassesDict.push_back( new EcsClass( #Class, typeid( Class ) ) );\
-  EcsPythonClassesDef.append("class " #Class ": \n\
-\t def SetEcsPtr( self, i ): \n\
-\t\t self._self = i \n\
-\t def GetEcsPtr( self ): \n\
-\t\t return self._self \n");\
+  EcsPythonClassesDef.append("class " #Class ":\n\
+\tdef __init__( self, ecsPtr ):\n\
+\t\tself._self = ecsPtr\n\
+\tdef __call__( self ):\n\
+\t\treturn self._self\n");\
 }
 
 //=================================================================================================
@@ -183,8 +201,8 @@
 {\
   std::string methodArgs = _Ecs_MakeMethodArgs< __VA_ARGS__ >();\
   _EcsAddNewMethod( #Class "_" #Method, Class##_##Method, 0x0001 );\
-  EcsPythonClassesDef.append( "\t def " #Method "( self").append(methodArgs).append(" ): \n\
-\t\t return EcsPython." #Class "_" #Method "( self._self").append(methodArgs).append(" ) \n" );\
+  EcsPythonClassesDef.append( "\tdef " #Method "( self").append(methodArgs).append(" ):\n\
+\t\treturn EcsPython." #Class "_" #Method "( self._self").append(methodArgs).append(" )\n" );\
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -204,7 +222,10 @@
   success = true; char* objs[2]; std::string pyTypes = "k";\
   _Ecs_AppendPythonArgType<A1T>( pyTypes );\
   if( _Ecs_ParseTuple( args, pyTypes.c_str(), &objs[0], &objs[1] ) )\
-    return ( RetT )( ( ObjT* ) objs[0] )->Method( (A1T)objs[1] );\
+  {\
+    A1T a1; _Ecs_FromPyObject(objs[1], a1);\
+    return ( RetT )( ( ObjT* ) objs[0] )->Method( a1 );\
+  }\
   success = false; return RetT();\
 }\
 template< class ObjT, class RetT, class A1T, class A2T >\
@@ -214,7 +235,11 @@
   _Ecs_AppendPythonArgType<A1T>( pyTypes );\
   _Ecs_AppendPythonArgType<A2T>( pyTypes );\
   if( _Ecs_ParseTuple( args, pyTypes.c_str(), &objs[0], &objs[1], &objs[2] ) )\
-    return ( RetT )( ( ObjT* ) objs[0] )->Method( (A1T)objs[1], (A2T)objs[2] );\
+  {\
+    A1T a1; _Ecs_FromPyObject(objs[1], a1);\
+    A2T a2; _Ecs_FromPyObject(objs[2], a2);\
+    return ( RetT )( ( ObjT* ) objs[0] )->Method( a1, a2 );\
+  }\
   success = false; return RetT();\
 }\
 template< class ObjT, class RetT, class A1T, class A2T, class A3T >\
@@ -225,7 +250,12 @@
   _Ecs_AppendPythonArgType<A2T>( pyTypes );\
   _Ecs_AppendPythonArgType<A3T>( pyTypes );\
   if( _Ecs_ParseTuple( args, pyTypes.c_str(), &objs[0], &objs[1], &objs[2], &objs[3] ) )\
-    return ( RetT )( ( ObjT* ) objs[0] )->Method( (A1T)objs[1], (A2T)objs[2], (A3T)objs[3] );\
+  {\
+    A1T a1; _Ecs_FromPyObject(objs[1], a1);\
+    A2T a2; _Ecs_FromPyObject(objs[2], a2);\
+    A3T a3; _Ecs_FromPyObject(objs[3], a3);\
+    return ( RetT )( ( ObjT* ) objs[0] )->Method( a1, a2, a3 );\
+  }\
   success = false; return RetT();\
 }\
 template< class ObjT, class RetT, class A1T, class A2T, class A3T, class A4T >\
@@ -237,7 +267,13 @@
   _Ecs_AppendPythonArgType<A3T>( pyTypes );\
   _Ecs_AppendPythonArgType<A4T>( pyTypes );\
   if( _Ecs_ParseTuple( args, pyTypes.c_str(), &objs[0], &objs[1], &objs[2], &objs[3], &objs[4] ) )\
-    return ( RetT )( ( ObjT* ) objs[0] )->Method( (A1T)objs[1], (A2T)objs[2], (A3T)objs[3], (A4T)objs[4] );\
+  {\
+    A1T a1; _Ecs_FromPyObject(objs[1], a1);\
+    A2T a2; _Ecs_FromPyObject(objs[2], a2);\
+    A3T a3; _Ecs_FromPyObject(objs[3], a3);\
+    A4T a4; _Ecs_FromPyObject(objs[4], a4);\
+    return ( RetT )( ( ObjT* ) objs[0] )->Method( a1, a2, a3, a4 );\
+  }\
   success = false; return RetT();\
 }\
 template< class ObjT, class RetT, class A1T, class A2T, class A3T, class A4T, class A5T >\
@@ -250,7 +286,14 @@
   _Ecs_AppendPythonArgType<A4T>( pyTypes );\
   _Ecs_AppendPythonArgType<A5T>( pyTypes );\
   if( _Ecs_ParseTuple( args, pyTypes.c_str(), &objs[0], &objs[1], &objs[2], &objs[3], &objs[4], &objs[5] ) )\
-    return ( RetT )( ( ObjT* ) objs[0] )->Method( (A1T)objs[1], (A2T)objs[2], (A3T)objs[3], (A4T)objs[4], (A5T)objs[5] );\
+  {\
+    A1T a1; _Ecs_FromPyObject(objs[1], a1);\
+    A2T a2; _Ecs_FromPyObject(objs[2], a2);\
+    A3T a3; _Ecs_FromPyObject(objs[3], a3);\
+    A4T a4; _Ecs_FromPyObject(objs[4], a4);\
+    A5T a5; _Ecs_FromPyObject(objs[5], a5);\
+    return ( RetT )( ( ObjT* ) objs[0] )->Method( a1, a2, a3, a4, a5 );\
+  }\
   success = false; return RetT();\
 }\
 template< class ObjT, class RetT, class A1T, class A2T, class A3T, class A4T, class A5T, class A6T >\
@@ -264,7 +307,15 @@
   _Ecs_AppendPythonArgType<A5T>( pyTypes );\
   _Ecs_AppendPythonArgType<A6T>( pyTypes );\
   if( _Ecs_ParseTuple( args, pyTypes.c_str(), &objs[0], &objs[1], &objs[2], &objs[3], &objs[4], &objs[5], &objs[6] ) )\
-    return ( RetT )( ( ObjT* ) objs[0] )->Method( (A1T)objs[1], (A2T)objs[2], (A3T)objs[3], (A4T)objs[4], (A5T)objs[5], (A6T)objs[6] );\
+  {\
+    A1T a1; _Ecs_FromPyObject(objs[1], a1);\
+    A2T a2; _Ecs_FromPyObject(objs[2], a2);\
+    A3T a3; _Ecs_FromPyObject(objs[3], a3);\
+    A4T a4; _Ecs_FromPyObject(objs[4], a4);\
+    A5T a5; _Ecs_FromPyObject(objs[5], a5);\
+    A6T a6; _Ecs_FromPyObject(objs[6], a6);\
+    return ( RetT )( ( ObjT* ) objs[0] )->Method( a1, a2, a3, a4, a5, a6 );\
+  }\
   success = false; return RetT();\
 }\
 template< class ObjT, class RetT, class A1T, class A2T, class A3T, class A4T, class A5T, class A6T, class A7T >\
@@ -279,7 +330,16 @@
   _Ecs_AppendPythonArgType<A6T>( pyTypes );\
   _Ecs_AppendPythonArgType<A7T>( pyTypes );\
   if( _Ecs_ParseTuple( args, pyTypes.c_str(), &objs[0], &objs[1], &objs[2], &objs[3], &objs[4], &objs[5], &objs[6], &objs[7] ) )\
-    return ( RetT )( ( ObjT* ) objs[0] )->Method( (A1T)objs[1], (A2T)objs[2], (A3T)objs[3], (A4T)objs[4], (A5T)objs[5], (A6T)objs[6], (A7T)objs[7] );\
+  {\
+    A1T a1; _Ecs_FromPyObject(objs[1], a1);\
+    A2T a2; _Ecs_FromPyObject(objs[2], a2);\
+    A3T a3; _Ecs_FromPyObject(objs[3], a3);\
+    A4T a4; _Ecs_FromPyObject(objs[4], a4);\
+    A5T a5; _Ecs_FromPyObject(objs[5], a5);\
+    A6T a6; _Ecs_FromPyObject(objs[6], a6);\
+    A7T a7; _Ecs_FromPyObject(objs[7], a7);\
+    return ( RetT )( ( ObjT* ) objs[0] )->Method( a1, a2, a3, a4, a5, a6, a7 );\
+  }\
   success = false; return RetT();\
 }\
 template< class ObjT, class RetT, class A1T, class A2T, class A3T, class A4T, class A5T, class A6T, class A7T, class A8T >\
@@ -295,7 +355,17 @@
   _Ecs_AppendPythonArgType<A7T>( pyTypes );\
   _Ecs_AppendPythonArgType<A8T>( pyTypes );\
   if( _Ecs_ParseTuple( args, pyTypes.c_str(), &objs[0], &objs[1], &objs[2], &objs[3], &objs[4], &objs[5], &objs[6], &objs[7], &objs[8] ) )\
-    return ( RetT )( ( ObjT* ) objs[0] )->Method( (A1T)objs[1], (A2T)objs[2], (A3T)objs[3], (A4T)objs[4], (A5T)objs[5], (A6T)objs[6], (A7T)objs[7], (A8T)objs[8] );\
+  {\
+    A1T a1; _Ecs_FromPyObject(objs[1], a1);\
+    A2T a2; _Ecs_FromPyObject(objs[2], a2);\
+    A3T a3; _Ecs_FromPyObject(objs[3], a3);\
+    A4T a4; _Ecs_FromPyObject(objs[4], a4);\
+    A5T a5; _Ecs_FromPyObject(objs[5], a5);\
+    A6T a6; _Ecs_FromPyObject(objs[6], a6);\
+    A7T a7; _Ecs_FromPyObject(objs[7], a7);\
+    A8T a8; _Ecs_FromPyObject(objs[8], a8);\
+    return ( RetT )( ( ObjT* ) objs[0] )->Method( a1, a2, a3, a4, a5, a6, a7, a8 );\
+  }\
   success = false; return RetT();\
 }\
 template< class ObjT, class RetT, class A1T, class A2T, class A3T, class A4T, class A5T, class A6T, class A7T, class A8T, class A9T >\
@@ -312,7 +382,18 @@
   _Ecs_AppendPythonArgType<A8T>( pyTypes );\
   _Ecs_AppendPythonArgType<A9T>( pyTypes );\
   if( _Ecs_ParseTuple( args, pyTypes.c_str(), &objs[0], &objs[1], &objs[2], &objs[3], &objs[4], &objs[5], &objs[6], &objs[7], &objs[8], &objs[9] ) )\
-    return ( RetT )( ( ObjT* ) objs[0] )->Method( (A1T)objs[1], (A2T)objs[2], (A3T)objs[3], (A4T)objs[4], (A5T)objs[5], (A6T)objs[6], (A7T)objs[7], (A8T)objs[8], (A9T)objs[9] );\
+  {\
+    A1T a1; _Ecs_FromPyObject(objs[1], a1);\
+    A2T a2; _Ecs_FromPyObject(objs[2], a2);\
+    A3T a3; _Ecs_FromPyObject(objs[3], a3);\
+    A4T a4; _Ecs_FromPyObject(objs[4], a4);\
+    A5T a5; _Ecs_FromPyObject(objs[5], a5);\
+    A6T a6; _Ecs_FromPyObject(objs[6], a6);\
+    A7T a7; _Ecs_FromPyObject(objs[7], a7);\
+    A8T a8; _Ecs_FromPyObject(objs[8], a8);\
+    A9T a9; _Ecs_FromPyObject(objs[9], a9);\
+    return ( RetT )( ( ObjT* ) objs[0] )->Method( a1, a2, a3, a4, a5, a6, a7, a8, a9 );\
+  }\
   success = false; return RetT();\
 }\
 template< class ObjT, class RetT, class A1T, class A2T, class A3T, class A4T, class A5T, class A6T, class A7T, class A8T, class A9T, class A10T >\
@@ -330,7 +411,19 @@
   _Ecs_AppendPythonArgType<A9T>( pyTypes );\
   _Ecs_AppendPythonArgType<A10T>( pyTypes );\
   if( _Ecs_ParseTuple( args, pyTypes.c_str(), &objs[0], &objs[1], &objs[2], &objs[3], &objs[4], &objs[5], &objs[6], &objs[7], &objs[8], &objs[9], &objs[10] ) )\
-    return ( RetT )( ( ObjT* ) objs[0] )->Method( (A1T)objs[1], (A2T)objs[2], (A3T)objs[3], (A4T)objs[4], (A5T)objs[5], (A6T)objs[6], (A7T)objs[7], (A8T)objs[8], (A9T)objs[9], (A10T)objs[10] );\
+  {\
+    A1T a1; _Ecs_FromPyObject(objs[1], a1);\
+    A2T a2; _Ecs_FromPyObject(objs[2], a2);\
+    A3T a3; _Ecs_FromPyObject(objs[3], a3);\
+    A4T a4; _Ecs_FromPyObject(objs[4], a4);\
+    A5T a5; _Ecs_FromPyObject(objs[5], a5);\
+    A6T a6; _Ecs_FromPyObject(objs[6], a6);\
+    A7T a7; _Ecs_FromPyObject(objs[7], a7);\
+    A8T a8; _Ecs_FromPyObject(objs[8], a8);\
+    A9T a9; _Ecs_FromPyObject(objs[9], a9);\
+    A10T a10; _Ecs_FromPyObject(objs[10], a10);\
+    return ( RetT )( ( ObjT* ) objs[0] )->Method( a1, a2, a3, a4, a5, a6, a7, a8, a9, a10 );\
+  }\
   success = false; return RetT();\
 }
 
@@ -338,10 +431,10 @@
 
 #define ECS_REGISTER_METHOD_RETURN( Class, Method, ReturnType, ... )\
 _MAKE_METHOD_CALL( Class, Method )\
-static PyObject* Class##_##Method( PyObject* self, PyObject* args )\
+static PyObject* Class##_##Method( PyObject*, PyObject* args )\
 {\
   bool success;\
-  PyObject* result = _Ecs_GetPythonReturnValue( Class##_##Call##Method< Class, ReturnType, ##__VA_ARGS__ >( args, success ) );\
+  PyObject* result = _Ecs_ToPyObject( Class##_##Call##Method< Class, ReturnType, ##__VA_ARGS__ >( args, success ) );\
   if( success )\
     return result;\
   else\
@@ -353,7 +446,7 @@
 
 #define ECS_REGISTER_METHOD_VOID( Class, Method, ... )\
 _MAKE_METHOD_CALL( Class, Method )\
-static PyObject* Class##_##Method( PyObject* self, PyObject* args )\
+static PyObject* Class##_##Method( PyObject*, PyObject* args )\
 {\
   bool success;\
   Class##_##Call##Method< Class, void, ##__VA_ARGS__ >( args, success );\

=== added file 'readme_windows.txt'
--- readme_windows.txt	1970-01-01 00:00:00 +0000
+++ readme_windows.txt	2014-12-05 19:42:33 +0000
@@ -0,0 +1,15 @@
+Compiling ECS::Python on Windows:
+
+Firstly, you'll need to ensure that the correct version of Python is
+being referenced in the CMakeLists:
+
+ 1. Open CMakeLists.txt
+ 2. Update the paths under "if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")"
+
+Secondly, the Python distro does not come packaged with the debug library:
+"pythonXX_d.lib". So, in order to get ECS:Python to compile in Debug mode:
+ 
+ 1. Open: "PythonXX\include\pyconfig.h"
+ 2. Comment out the line "#	define Py_DEBUG
+"
+ 3. Search and replace "_d.lib" with ".lib"
\ No newline at end of file

=== modified file 'src/EcsMacros.cpp'
--- src/EcsMacros.cpp	2014-01-25 10:46:21 +0000
+++ src/EcsMacros.cpp	2014-12-05 19:42:33 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 ECS:Python - Light-Weight C++ Wrapper For Embedding Python Into C++
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of EcsPython.
 
@@ -37,45 +37,49 @@
 
 //=================================================================================================
 
-DLLPORT int (*_Ecs_ParseTuple)( PyObject *, const char *, ... ) = NULL;
-
-//template PyObject* _Ecs_GetPythonReturnValue( const char*& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const std::string& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const char& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const unsigned char& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const short& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const unsigned short& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const int& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const unsigned int& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const long& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const unsigned long& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const long long& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const unsigned long long& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const bool& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const double& );
-template DLLEXPORT PyObject* _Ecs_GetPythonReturnValue( const float& );
+int (*_Ecs_ParseTuple)( PyObject *, const char *, ... ) = NULL;
+
+typedef char* charptr;
+typedef void* voidptr;
+
+template PyObject* _Ecs_ToPyObject( const charptr& );
+template PyObject* _Ecs_ToPyObject( const std::string& );
+template PyObject* _Ecs_ToPyObject( const char& );
+template PyObject* _Ecs_ToPyObject( const unsigned char& );
+template PyObject* _Ecs_ToPyObject( const short& );
+template PyObject* _Ecs_ToPyObject( const unsigned short& );
+template PyObject* _Ecs_ToPyObject( const int& );
+template PyObject* _Ecs_ToPyObject( const unsigned int& );
+template PyObject* _Ecs_ToPyObject( const long& );
+template PyObject* _Ecs_ToPyObject( const unsigned long& );
+template PyObject* _Ecs_ToPyObject( const long long& );
+template PyObject* _Ecs_ToPyObject( const unsigned long long& );
+template PyObject* _Ecs_ToPyObject( const bool& );
+template PyObject* _Ecs_ToPyObject( const double& );
+template PyObject* _Ecs_ToPyObject( const float& );
+template PyObject* _Ecs_ToPyObject( const voidptr& );
 
 //=================================================================================================
 
 void _EcsAddNewMethod( const char *methodName, PyCFunction methodPointer, int methodFlags )
 {
-if( _Ecs_ParseTuple == NULL )
-{
-_Ecs_ParseTuple = PyArg_ParseTuple;
-}
+  if( _Ecs_ParseTuple == NULL )
+  {
+    _Ecs_ParseTuple = PyArg_ParseTuple;
+  }
 
-PyMethodDef newMethod = { methodName, methodPointer, methodFlags };
-EcsPythonMethods.push_back( newMethod );
+  PyMethodDef newMethod = { methodName, methodPointer, methodFlags, NULL };
+  EcsPythonMethods.push_back( newMethod );
 }
 
 //-------------------------------------------------------------------------------------------------
 
 template< class Type >
-PyObject* _Ecs_GetPythonReturnValue( const Type& Value )
+PyObject* _Ecs_ToPyObject( const Type& Value )
 {
   if( typeid( Type ) == typeid( char* ) )
     return PyUnicode_FromFormat( "%s", *((char**)(&Value)) );
-  if( typeid( Type ) == typeid( std::string ) )
+  else if( typeid( Type ) == typeid( std::string ) )
     return PyUnicode_FromFormat( "%s", (*((std::string*)(&Value))).c_str() );
   else if( typeid( Type ) == typeid( char ) )
     return PyUnicode_FromFormat( "%c", *((char*)(&Value)) );
@@ -103,6 +107,8 @@
     return PyFloat_FromDouble( *((double*)(&Value)) );
   else if( typeid( Type ) == typeid( float ) )
     return PyFloat_FromDouble( *((float*)(&Value)) );
+  else if( typeid( Type ) == typeid( void* ) )
+    return PyLong_FromUnsignedLong( *((unsigned long*)(&Value)) );
   else
     return NULL;
 }

=== modified file 'src/EcsPython.cpp'
--- src/EcsPython.cpp	2014-01-26 12:29:03 +0000
+++ src/EcsPython.cpp	2014-12-05 19:42:33 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 ECS:Python - Light-Weight C++ Wrapper For Embedding Python Into C++
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of EcsPython.
 
@@ -43,14 +43,14 @@
 // EcsPython Globals
 // =================
 
-DLLPORT DspMutex EcsPythonCmdMutex;												// Mutex for thread-safe python calls
-DLLPORT std::vector< EcsClass* > EcsPythonClassesDict;		// C++ class dictionary
-DLLPORT std::string EcsPythonClassesDef;									// Python definition string for C++ classes 
-DLLPORT std::vector< PyMethodDef > EcsPythonMethods;			// Methods for EcsPython python module
-DLLPORT std::vector< EcsObject* > EcsExposedObjects;			// C++ objects exposed to Python
+DspMutex EcsPythonCmdMutex;                    // Mutex for thread-safe python calls
+std::vector< EcsClass* > EcsPythonClassesDict; // C++ class dictionary
+std::string EcsPythonClassesDef;               // Python definition string for C++ classes
+std::vector< PyMethodDef > EcsPythonMethods;   // Methods for EcsPython python module
+std::vector< EcsObject* > EcsExposedObjects;   // C++ objects exposed to Python
 
 #if PY_MAJOR_VERSION >= 3
-DLLPORT struct PyModuleDef EcsPythonModule;							  // EcsPython python module
+struct PyModuleDef EcsPythonModule;            // EcsPython python module
 #endif
 
 //=================================================================================================
@@ -75,7 +75,7 @@
     _Ecs_Expose_Object( EcsExposedObjects[i]->pyObject, EcsExposedObjects[i]->pyClassName, EcsExposedObjects[i]->pyObjectName );
   }
 
-  EcsPythonMethods.pop_back();	// pop the NULL off the end of the methods array so that more can be added later
+  EcsPythonMethods.pop_back(); // pop the NULL off the end of the methods array so that more can be added later
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -171,7 +171,7 @@
 {
   PyMethodDef nullMethod =
   {
-    NULL, NULL, 0
+    NULL, NULL, 0, NULL
   };
   EcsPythonMethods.push_back( nullMethod );
 
@@ -209,11 +209,7 @@
   module = PyImport_ImportModule( "__main__" );
   PyObject_SetAttrString( module, "ecsPtr", newPyObject );
 
-  pythonCall.append( pyObjectName ).append( " = " ).append( pyClassName ).append( "()" );
-  Ecs_Python_Cmd( pythonCall );
-
-  pythonCall.clear();
-  pythonCall.append( pyObjectName ).append( ".SetEcsPtr(ecsPtr)" );
+  pythonCall.append( pyObjectName ).append( " = " ).append( pyClassName ).append( "(ecsPtr)" );
   Ecs_Python_Cmd( pythonCall );
 
   Ecs_Python_Cmd( "del ecsPtr" );

=== removed directory 'win_fix'
=== removed directory 'win_fix/Python27'
=== removed file 'win_fix/Python27/pyconfig.h'
--- win_fix/Python27/pyconfig.h	2014-01-17 13:26:46 +0000
+++ win_fix/Python27/pyconfig.h	1970-01-01 00:00:00 +0000
@@ -1,756 +0,0 @@
-#ifndef Py_CONFIG_H
-#define Py_CONFIG_H
-
-/* pyconfig.h.  NOT Generated automatically by configure.
-
-This is a manually maintained version used for the Watcom,
-Borland and Microsoft Visual C++ compilers.  It is a
-standard part of the Python distribution.
-
-WINDOWS DEFINES:
-The code specific to Windows should be wrapped around one of
-the following #defines
-
-MS_WIN64 - Code specific to the MS Win64 API
-MS_WIN32 - Code specific to the MS Win32 (and Win64) API (obsolete, this covers all supported APIs)
-MS_WINDOWS - Code specific to Windows, but all versions.
-MS_WINCE - Code specific to Windows CE
-Py_ENABLE_SHARED - Code if the Python core is built as a DLL.
-
-Also note that neither "_M_IX86" or "_MSC_VER" should be used for
-any purpose other than "Windows Intel x86 specific" and "Microsoft
-compiler specific".  Therefore, these should be very rare.
-
-
-NOTE: The following symbols are deprecated:
-NT, USE_DL_EXPORT, USE_DL_IMPORT, DL_EXPORT, DL_IMPORT
-MS_CORE_DLL.
-
-WIN32 is still required for the locale module.
-
-*/
-
-#ifdef _WIN32_WCE
-#define MS_WINCE
-#endif
-
-/* Deprecated USE_DL_EXPORT macro - please use Py_BUILD_CORE */
-#ifdef USE_DL_EXPORT
-#	define Py_BUILD_CORE
-#endif /* USE_DL_EXPORT */
-
-/* Visual Studio 2005 introduces deprecation warnings for
-   "insecure" and POSIX functions. The insecure functions should
-   be replaced by *_s versions (according to Microsoft); the
-   POSIX functions by _* versions (which, according to Microsoft,
-   would be ISO C conforming). Neither renaming is feasible, so
-   we just silence the warnings. */
-
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-#ifndef _CRT_NONSTDC_NO_DEPRECATE
-#define _CRT_NONSTDC_NO_DEPRECATE 1
-#endif
-
-/* Windows CE does not have these */
-#ifndef MS_WINCE
-#define HAVE_IO_H
-#define HAVE_SYS_UTIME_H
-#define HAVE_TEMPNAM
-#define HAVE_TMPFILE
-#define HAVE_TMPNAM
-#define HAVE_CLOCK
-#define HAVE_STRERROR
-#endif
-
-#ifdef HAVE_IO_H
-#include <io.h>
-#endif
-
-#define HAVE_HYPOT
-#define HAVE_STRFTIME
-#define DONT_HAVE_SIG_ALARM
-#define DONT_HAVE_SIG_PAUSE
-#define LONG_BIT	32
-#define WORD_BIT 32
-#define PREFIX ""
-#define EXEC_PREFIX ""
-
-#define MS_WIN32 /* only support win32 and greater. */
-#define MS_WINDOWS
-#ifndef PYTHONPATH
-#	define PYTHONPATH ".\\DLLs;.\\lib;.\\lib\\plat-win;.\\lib\\lib-tk"
-#endif
-#define NT_THREADS
-#define WITH_THREAD
-#ifndef NETSCAPE_PI
-#define USE_SOCKET
-#endif
-
-/* CE6 doesn't have strdup() but _strdup(). Assume the same for earlier versions. */
-#if defined(MS_WINCE)
-#  include <stdlib.h>
-#  define strdup _strdup
-#endif
-
-#ifdef MS_WINCE
-/* Windows CE does not support environment variables */
-#define getenv(v) (NULL)
-#define environ (NULL)
-#endif
-
-/* Compiler specific defines */
-
-/* ------------------------------------------------------------------------*/
-/* Microsoft C defines _MSC_VER */
-#ifdef _MSC_VER
-
-/* We want COMPILER to expand to a string containing _MSC_VER's *value*.
- * This is horridly tricky, because the stringization operator only works
- * on macro arguments, and doesn't evaluate macros passed *as* arguments.
- * Attempts simpler than the following appear doomed to produce "_MSC_VER"
- * literally in the string.
- */
-#define _Py_PASTE_VERSION(SUFFIX) \
-	("[MSC v." _Py_STRINGIZE(_MSC_VER) " " SUFFIX "]")
-/* e.g., this produces, after compile-time string catenation,
- * 	("[MSC v.1200 32 bit (Intel)]")
- *
- * _Py_STRINGIZE(_MSC_VER) expands to
- * _Py_STRINGIZE1((_MSC_VER)) expands to
- * _Py_STRINGIZE2(_MSC_VER) but as this call is the result of token-pasting
- *      it's scanned again for macros and so further expands to (under MSVC 6)
- * _Py_STRINGIZE2(1200) which then expands to
- * "1200"
- */
-#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
-#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
-#define _Py_STRINGIZE2(X) #X
-
-/* MSVC defines _WINxx to differentiate the windows platform types
-
-   Note that for compatibility reasons _WIN32 is defined on Win32
-   *and* on Win64. For the same reasons, in Python, MS_WIN32 is
-   defined on Win32 *and* Win64. Win32 only code must therefore be
-   guarded as follows:
-   	#if defined(MS_WIN32) && !defined(MS_WIN64)
-   Some modules are disabled on Itanium processors, therefore we
-   have MS_WINI64 set for those targets, otherwise MS_WINX64
-*/
-#ifdef _WIN64
-#define MS_WIN64
-#endif
-
-/* set the COMPILER */
-#ifdef MS_WIN64
-#if defined(_M_IA64)
-#define COMPILER _Py_PASTE_VERSION("64 bit (Itanium)")
-#define MS_WINI64
-#elif defined(_M_X64) || defined(_M_AMD64)
-#define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)")
-#define MS_WINX64
-#else
-#define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)")
-#endif
-#endif /* MS_WIN64 */
-
-/* set the version macros for the windows headers */
-#ifdef MS_WINX64
-/* 64 bit only runs on XP or greater */
-#define Py_WINVER _WIN32_WINNT_WINXP
-#define Py_NTDDI NTDDI_WINXP
-#else
-/* Python 2.6+ requires Windows 2000 or greater */
-#ifdef _WIN32_WINNT_WIN2K
-#define Py_WINVER _WIN32_WINNT_WIN2K
-#else
-#define Py_WINVER 0x0500
-#endif
-#define Py_NTDDI NTDDI_WIN2KSP4
-#endif
-
-/* We only set these values when building Python - we don't want to force
-   these values on extensions, as that will affect the prototypes and
-   structures exposed in the Windows headers. Even when building Python, we
-   allow a single source file to override this - they may need access to
-   structures etc so it can optionally use new Windows features if it
-   determines at runtime they are available.
-*/
-#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE)
-#ifndef NTDDI_VERSION
-#define NTDDI_VERSION Py_NTDDI
-#endif
-#ifndef WINVER
-#define WINVER Py_WINVER
-#endif
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT Py_WINVER
-#endif
-#endif
-
-/* _W64 is not defined for VC6 or eVC4 */
-#ifndef _W64
-#define _W64
-#endif
-
-/* Define like size_t, omitting the "unsigned" */
-#ifdef MS_WIN64
-typedef __int64 ssize_t;
-#else
-typedef _W64 int ssize_t;
-#endif
-#define HAVE_SSIZE_T 1
-
-#if defined(MS_WIN32) && !defined(MS_WIN64)
-#ifdef _M_IX86
-#define COMPILER _Py_PASTE_VERSION("32 bit (Intel)")
-#else
-#define COMPILER _Py_PASTE_VERSION("32 bit (Unknown)")
-#endif
-#endif /* MS_WIN32 && !MS_WIN64 */
-
-typedef int pid_t;
-
-#include <float.h>
-#define Py_IS_NAN _isnan
-#define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X))
-#define Py_IS_FINITE(X) _finite(X)
-#define copysign _copysign
-#define hypot _hypot
-
-#endif /* _MSC_VER */
-
-/* define some ANSI types that are not defined in earlier Win headers */
-#if defined(_MSC_VER) && _MSC_VER >= 1200
-/* This file only exists in VC 6.0 or higher */
-#include <basetsd.h>
-#endif
-
-/* ------------------------------------------------------------------------*/
-/* The Borland compiler defines __BORLANDC__ */
-/* XXX These defines are likely incomplete, but should be easy to fix. */
-#ifdef __BORLANDC__
-#define COMPILER "[Borland]"
-
-#ifdef _WIN32
-/* tested with BCC 5.5 (__BORLANDC__ >= 0x0550)
- */
-
-typedef int pid_t;
-/* BCC55 seems to understand __declspec(dllimport), it is used in its
-   own header files (winnt.h, ...) - so we can do nothing and get the default*/
-
-#undef HAVE_SYS_UTIME_H
-#define HAVE_UTIME_H
-#define HAVE_DIRENT_H
-
-/* rename a few functions for the Borland compiler */
-#include <io.h>
-#define _chsize chsize
-#define _setmode setmode
-
-#else /* !_WIN32 */
-#error "Only Win32 and later are supported"
-#endif /* !_WIN32 */
-
-#endif /* BORLANDC */
-
-/* ------------------------------------------------------------------------*/
-/* egcs/gnu-win32 defines __GNUC__ and _WIN32 */
-#if defined(__GNUC__) && defined(_WIN32)
-/* XXX These defines are likely incomplete, but should be easy to fix.
-   They should be complete enough to build extension modules. */
-/* Suggested by Rene Liebscher <[e-mail]> to avoid a GCC 2.91.*
-   bug that requires structure imports.  More recent versions of the
-   compiler don't exhibit this bug.
-*/
-#if (__GNUC__==2) && (__GNUC_MINOR__<=91)
-#warning "Please use an up-to-date version of gcc! (>2.91 recommended)"
-#endif
-
-#define COMPILER "[gcc]"
-#define hypot _hypot
-#define PY_LONG_LONG long long
-#define PY_LLONG_MIN LLONG_MIN
-#define PY_LLONG_MAX LLONG_MAX
-#define PY_ULLONG_MAX ULLONG_MAX
-#endif /* GNUC */
-
-/* ------------------------------------------------------------------------*/
-/* lcc-win32 defines __LCC__ */
-#if defined(__LCC__)
-/* XXX These defines are likely incomplete, but should be easy to fix.
-   They should be complete enough to build extension modules. */
-
-#define COMPILER "[lcc-win32]"
-typedef int pid_t;
-/* __declspec() is supported here too - do nothing to get the defaults */
-
-#endif /* LCC */
-
-/* ------------------------------------------------------------------------*/
-/* End of compilers - finish up */
-
-#ifndef NO_STDIO_H
-#	include <stdio.h>
-#endif
-
-/* 64 bit ints are usually spelt __int64 unless compiler has overridden */
-#define HAVE_LONG_LONG 1
-#ifndef PY_LONG_LONG
-#	define PY_LONG_LONG __int64
-#	define PY_LLONG_MAX _I64_MAX
-#	define PY_LLONG_MIN _I64_MIN
-#	define PY_ULLONG_MAX _UI64_MAX
-#endif
-
-/* For Windows the Python core is in a DLL by default.  Test
-Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
-#if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED)
-#	define Py_ENABLE_SHARED 1 /* standard symbol for shared library */
-#	define MS_COREDLL	/* deprecated old symbol */
-#endif /* !MS_NO_COREDLL && ... */
-
-/*  All windows compilers that use this header support __declspec */
-#define HAVE_DECLSPEC_DLL
-
-/* For an MSVC DLL, we can nominate the .lib files used by extensions */
-#ifdef MS_COREDLL
-#	ifndef Py_BUILD_CORE /* not building the core - must be an ext */
-#		if defined(_MSC_VER)
-			/* So MSVC users need not specify the .lib file in
-			their Makefile (other compilers are generally
-			taken care of by distutils.) */
-#			ifdef _DEBUG
-#				pragma comment(lib,"python27.lib")
-#			else
-#				pragma comment(lib,"python27.lib")
-#			endif /* _DEBUG */
-#		endif /* _MSC_VER */
-#	endif /* Py_BUILD_CORE */
-#endif /* MS_COREDLL */
-
-#if defined(MS_WIN64)
-/* maintain "win32" sys.platform for backward compatibility of Python code,
-   the Win64 API should be close enough to the Win32 API to make this
-   preferable */
-#	define PLATFORM "win32"
-#	define SIZEOF_VOID_P 8
-#	define SIZEOF_TIME_T 8
-#	define SIZEOF_OFF_T 4
-#	define SIZEOF_FPOS_T 8
-#	define SIZEOF_HKEY 8
-#	define SIZEOF_SIZE_T 8
-/* configure.in defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG,
-   sizeof(off_t) > sizeof(long), and sizeof(PY_LONG_LONG) >= sizeof(off_t).
-   On Win64 the second condition is not true, but if fpos_t replaces off_t
-   then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64
-   should define this. */
-#	define HAVE_LARGEFILE_SUPPORT
-#elif defined(MS_WIN32)
-#	define PLATFORM "win32"
-#	define HAVE_LARGEFILE_SUPPORT
-#	define SIZEOF_VOID_P 4
-#	define SIZEOF_OFF_T 4
-#	define SIZEOF_FPOS_T 8
-#	define SIZEOF_HKEY 4
-#	define SIZEOF_SIZE_T 4
-	/* MS VS2005 changes time_t to an 64-bit type on all platforms */
-#	if defined(_MSC_VER) && _MSC_VER >= 1400
-#	define SIZEOF_TIME_T 8
-#	else
-#	define SIZEOF_TIME_T 4
-#	endif
-#endif
-
-#ifdef _DEBUG
-//#	define Py_DEBUG
-#endif
-
-
-#ifdef MS_WIN32
-
-#define SIZEOF_SHORT 2
-#define SIZEOF_INT 4
-#define SIZEOF_LONG 4
-#define SIZEOF_LONG_LONG 8
-#define SIZEOF_DOUBLE 8
-#define SIZEOF_FLOAT 4
-
-/* VC 7.1 has them and VC 6.0 does not.  VC 6.0 has a version number of 1200.
-   Microsoft eMbedded Visual C++ 4.0 has a version number of 1201 and doesn't
-   define these.
-   If some compiler does not provide them, modify the #if appropriately. */
-#if defined(_MSC_VER)
-#if _MSC_VER > 1300
-#define HAVE_UINTPTR_T 1
-#define HAVE_INTPTR_T 1
-#else
-/* VC6, VS 2002 and eVC4 don't support the C99 LL suffix for 64-bit integer literals */
-#define Py_LL(x) x##I64
-#endif  /* _MSC_VER > 1200  */
-#endif  /* _MSC_VER */
-
-#endif
-
-/* define signed and unsigned exact-width 32-bit and 64-bit types, used in the
-   implementation of Python long integers. */
-#ifndef PY_UINT32_T
-#if SIZEOF_INT == 4
-#define HAVE_UINT32_T 1
-#define PY_UINT32_T unsigned int
-#elif SIZEOF_LONG == 4
-#define HAVE_UINT32_T 1
-#define PY_UINT32_T unsigned long
-#endif
-#endif
-
-#ifndef PY_UINT64_T
-#if SIZEOF_LONG_LONG == 8
-#define HAVE_UINT64_T 1
-#define PY_UINT64_T unsigned PY_LONG_LONG
-#endif
-#endif
-
-#ifndef PY_INT32_T
-#if SIZEOF_INT == 4
-#define HAVE_INT32_T 1
-#define PY_INT32_T int
-#elif SIZEOF_LONG == 4
-#define HAVE_INT32_T 1
-#define PY_INT32_T long
-#endif
-#endif
-
-#ifndef PY_INT64_T
-#if SIZEOF_LONG_LONG == 8
-#define HAVE_INT64_T 1
-#define PY_INT64_T PY_LONG_LONG
-#endif
-#endif
-
-/* Fairly standard from here! */
-
-/* Define to 1 if you have the `copysign' function. */
-#define HAVE_COPYSIGN 1
-
-/* Define to 1 if you have the `isinf' macro. */
-#define HAVE_DECL_ISINF 1
-
-/* Define to 1 if you have the `isnan' function. */
-#define HAVE_DECL_ISNAN 1
-
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
-
-/* Define to empty if the keyword does not work.  */
-/* #define const  */
-
-/* Define to 1 if you have the <conio.h> header file. */
-#ifndef MS_WINCE
-#define HAVE_CONIO_H 1
-#endif
-
-/* Define to 1 if you have the <direct.h> header file. */
-#ifndef MS_WINCE
-#define HAVE_DIRECT_H 1
-#endif
-
-/* Define if you have dirent.h.  */
-/* #define DIRENT 1 */
-
-/* Define to the type of elements in the array set by `getgroups'.
-   Usually this is either `int' or `gid_t'.  */
-/* #undef GETGROUPS_T */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef gid_t */
-
-/* Define if your struct tm has tm_zone.  */
-/* #undef HAVE_TM_ZONE */
-
-/* Define if you don't have tm_zone but do have the external array
-   tzname.  */
-#define HAVE_TZNAME
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef mode_t */
-
-/* Define if you don't have dirent.h, but have ndir.h.  */
-/* #undef NDIR */
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
-
-/* Define if the system does not provide POSIX.1 features except
-   with this defined.  */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if you don't have dirent.h, but have sys/dir.h.  */
-/* #undef SYSDIR */
-
-/* Define if you don't have dirent.h, but have sys/ndir.h.  */
-/* #undef SYSNDIR */
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-/* #undef TIME_WITH_SYS_TIME */
-
-/* Define if your <sys/time.h> declares struct tm.  */
-/* #define TM_IN_SYS_TIME 1 */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef uid_t */
-
-/* Define if the closedir function returns void instead of int.  */
-/* #undef VOID_CLOSEDIR */
-
-/* Define if getpgrp() must be called as getpgrp(0)
-   and (consequently) setpgrp() as setpgrp(0, 0). */
-/* #undef GETPGRP_HAVE_ARGS */
-
-/* Define this if your time.h defines altzone */
-/* #define HAVE_ALTZONE */
-
-/* Define if you have the putenv function.  */
-#ifndef MS_WINCE
-#define HAVE_PUTENV
-#endif
-
-/* Define if your compiler supports function prototypes */
-#define HAVE_PROTOTYPES
-
-/* Define if  you can safely include both <sys/select.h> and <sys/time.h>
-   (which you can't on SCO ODT 3.0). */
-/* #undef SYS_SELECT_WITH_SYS_TIME */
-
-/* Define if you want documentation strings in extension modules */
-#define WITH_DOC_STRINGS 1
-
-/* Define if you want to compile in rudimentary thread support */
-/* #undef WITH_THREAD */
-
-/* Define if you want to use the GNU readline library */
-/* #define WITH_READLINE 1 */
-
-/* Define if you want to have a Unicode type. */
-#define Py_USING_UNICODE
-
-/* Define as the size of the unicode type. */
-/* This is enough for unicodeobject.h to do the "right thing" on Windows. */
-#define Py_UNICODE_SIZE 2
-
-/* Use Python's own small-block memory-allocator. */
-#define WITH_PYMALLOC 1
-
-/* Define if you have clock.  */
-/* #define HAVE_CLOCK */
-
-/* Define when any dynamic module loading is enabled */
-#define HAVE_DYNAMIC_LOADING
-
-/* Define if you have ftime.  */
-#ifndef MS_WINCE
-#define HAVE_FTIME
-#endif
-
-/* Define if you have getpeername.  */
-#define HAVE_GETPEERNAME
-
-/* Define if you have getpgrp.  */
-/* #undef HAVE_GETPGRP */
-
-/* Define if you have getpid.  */
-#ifndef MS_WINCE
-#define HAVE_GETPID
-#endif
-
-/* Define if you have gettimeofday.  */
-/* #undef HAVE_GETTIMEOFDAY */
-
-/* Define if you have getwd.  */
-/* #undef HAVE_GETWD */
-
-/* Define if you have lstat.  */
-/* #undef HAVE_LSTAT */
-
-/* Define if you have the mktime function.  */
-#define HAVE_MKTIME
-
-/* Define if you have nice.  */
-/* #undef HAVE_NICE */
-
-/* Define if you have readlink.  */
-/* #undef HAVE_READLINK */
-
-/* Define if you have select.  */
-/* #undef HAVE_SELECT */
-
-/* Define if you have setpgid.  */
-/* #undef HAVE_SETPGID */
-
-/* Define if you have setpgrp.  */
-/* #undef HAVE_SETPGRP */
-
-/* Define if you have setsid.  */
-/* #undef HAVE_SETSID */
-
-/* Define if you have setvbuf.  */
-#define HAVE_SETVBUF
-
-/* Define if you have siginterrupt.  */
-/* #undef HAVE_SIGINTERRUPT */
-
-/* Define if you have symlink.  */
-/* #undef HAVE_SYMLINK */
-
-/* Define if you have tcgetpgrp.  */
-/* #undef HAVE_TCGETPGRP */
-
-/* Define if you have tcsetpgrp.  */
-/* #undef HAVE_TCSETPGRP */
-
-/* Define if you have times.  */
-/* #undef HAVE_TIMES */
-
-/* Define if you have uname.  */
-/* #undef HAVE_UNAME */
-
-/* Define if you have waitpid.  */
-/* #undef HAVE_WAITPID */
-
-/* Define to 1 if you have the `wcscoll' function. */
-#ifndef MS_WINCE
-#define HAVE_WCSCOLL 1
-#endif
-
-/* Define if you have the <dlfcn.h> header file.  */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the <errno.h> header file. */
-#ifndef MS_WINCE
-#define HAVE_ERRNO_H 1
-#endif
-
-/* Define if you have the <fcntl.h> header file.  */
-#ifndef MS_WINCE
-#define HAVE_FCNTL_H 1
-#endif
-
-/* Define to 1 if you have the <process.h> header file. */
-#ifndef MS_WINCE
-#define HAVE_PROCESS_H 1
-#endif
-
-/* Define to 1 if you have the <signal.h> header file. */
-#ifndef MS_WINCE
-#define HAVE_SIGNAL_H 1
-#endif
-
-/* Define if you have the <stdarg.h> prototypes.  */
-#define HAVE_STDARG_PROTOTYPES
-
-/* Define if you have the <stddef.h> header file.  */
-#define HAVE_STDDEF_H 1
-
-/* Define if you have the <sys/audioio.h> header file.  */
-/* #undef HAVE_SYS_AUDIOIO_H */
-
-/* Define if you have the <sys/param.h> header file.  */
-/* #define HAVE_SYS_PARAM_H 1 */
-
-/* Define if you have the <sys/select.h> header file.  */
-/* #define HAVE_SYS_SELECT_H 1 */
-
-/* Define to 1 if you have the <sys/stat.h> header file.  */
-#ifndef MS_WINCE
-#define HAVE_SYS_STAT_H 1
-#endif
-
-/* Define if you have the <sys/time.h> header file.  */
-/* #define HAVE_SYS_TIME_H 1 */
-
-/* Define if you have the <sys/times.h> header file.  */
-/* #define HAVE_SYS_TIMES_H 1 */
-
-/* Define to 1 if you have the <sys/types.h> header file.  */
-#ifndef MS_WINCE
-#define HAVE_SYS_TYPES_H 1
-#endif
-
-/* Define if you have the <sys/un.h> header file.  */
-/* #define HAVE_SYS_UN_H 1 */
-
-/* Define if you have the <sys/utime.h> header file.  */
-/* #define HAVE_SYS_UTIME_H 1 */
-
-/* Define if you have the <sys/utsname.h> header file.  */
-/* #define HAVE_SYS_UTSNAME_H 1 */
-
-/* Define if you have the <thread.h> header file.  */
-/* #undef HAVE_THREAD_H */
-
-/* Define if you have the <unistd.h> header file.  */
-/* #define HAVE_UNISTD_H 1 */
-
-/* Define if you have the <utime.h> header file.  */
-/* #define HAVE_UTIME_H 1 */
-
-/* Define if the compiler provides a wchar.h header file. */
-#define HAVE_WCHAR_H 1
-
-/* Define if you have the dl library (-ldl).  */
-/* #undef HAVE_LIBDL */
-
-/* Define if you have the mpc library (-lmpc).  */
-/* #undef HAVE_LIBMPC */
-
-/* Define if you have the nsl library (-lnsl).  */
-#define HAVE_LIBNSL 1
-
-/* Define if you have the seq library (-lseq).  */
-/* #undef HAVE_LIBSEQ */
-
-/* Define if you have the socket library (-lsocket).  */
-#define HAVE_LIBSOCKET 1
-
-/* Define if you have the sun library (-lsun).  */
-/* #undef HAVE_LIBSUN */
-
-/* Define if you have the termcap library (-ltermcap).  */
-/* #undef HAVE_LIBTERMCAP */
-
-/* Define if you have the termlib library (-ltermlib).  */
-/* #undef HAVE_LIBTERMLIB */
-
-/* Define if you have the thread library (-lthread).  */
-/* #undef HAVE_LIBTHREAD */
-
-/* WinSock does not use a bitmask in select, and uses
-   socket handles greater than FD_SETSIZE */
-#define Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE
-
-/* Define if C doubles are 64-bit IEEE 754 binary format, stored with the
-   least significant byte first */
-#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1
-
-#endif /* !Py_CONFIG_H */

=== removed directory 'win_fix/Python33'
=== removed file 'win_fix/Python33/pyconfig.h'
--- win_fix/Python33/pyconfig.h	2014-01-17 13:26:46 +0000
+++ win_fix/Python33/pyconfig.h	1970-01-01 00:00:00 +0000
@@ -1,765 +0,0 @@
-#ifndef Py_CONFIG_H
-#define Py_CONFIG_H
-
-/* pyconfig.h.  NOT Generated automatically by configure.
-
-This is a manually maintained version used for the Watcom,
-Borland and Microsoft Visual C++ compilers.  It is a
-standard part of the Python distribution.
-
-WINDOWS DEFINES:
-The code specific to Windows should be wrapped around one of
-the following #defines
-
-MS_WIN64 - Code specific to the MS Win64 API
-MS_WIN32 - Code specific to the MS Win32 (and Win64) API (obsolete, this covers all supported APIs)
-MS_WINDOWS - Code specific to Windows, but all versions.
-MS_WINCE - Code specific to Windows CE
-Py_ENABLE_SHARED - Code if the Python core is built as a DLL.
-
-Also note that neither "_M_IX86" or "_MSC_VER" should be used for
-any purpose other than "Windows Intel x86 specific" and "Microsoft
-compiler specific".  Therefore, these should be very rare.
-
-
-NOTE: The following symbols are deprecated:
-NT, USE_DL_EXPORT, USE_DL_IMPORT, DL_EXPORT, DL_IMPORT
-MS_CORE_DLL.
-
-WIN32 is still required for the locale module.
-
-*/
-
-#ifdef _WIN32_WCE
-#define MS_WINCE
-#endif
-
-/* Deprecated USE_DL_EXPORT macro - please use Py_BUILD_CORE */
-#ifdef USE_DL_EXPORT
-#	define Py_BUILD_CORE
-#endif /* USE_DL_EXPORT */
-
-/* Visual Studio 2005 introduces deprecation warnings for
-   "insecure" and POSIX functions. The insecure functions should
-   be replaced by *_s versions (according to Microsoft); the
-   POSIX functions by _* versions (which, according to Microsoft,
-   would be ISO C conforming). Neither renaming is feasible, so
-   we just silence the warnings. */
-
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-#ifndef _CRT_NONSTDC_NO_DEPRECATE
-#define _CRT_NONSTDC_NO_DEPRECATE 1
-#endif
-
-/* Windows CE does not have these */
-#ifndef MS_WINCE
-#define HAVE_IO_H
-#define HAVE_SYS_UTIME_H
-#define HAVE_TEMPNAM
-#define HAVE_TMPFILE
-#define HAVE_TMPNAM
-#define HAVE_CLOCK
-#define HAVE_STRERROR
-#endif
-
-#ifdef HAVE_IO_H
-#include <io.h>
-#endif
-
-#define HAVE_HYPOT
-#define HAVE_STRFTIME
-#define DONT_HAVE_SIG_ALARM
-#define DONT_HAVE_SIG_PAUSE
-#define LONG_BIT	32
-#define WORD_BIT 32
-#define PREFIX ""
-#define EXEC_PREFIX ""
-
-#define MS_WIN32 /* only support win32 and greater. */
-#define MS_WINDOWS
-#ifndef PYTHONPATH
-#	define PYTHONPATH L".\\DLLs;.\\lib"
-#endif
-#define NT_THREADS
-#define WITH_THREAD
-#ifndef NETSCAPE_PI
-#define USE_SOCKET
-#endif
-
-/* CE6 doesn't have strdup() but _strdup(). Assume the same for earlier versions. */
-#if defined(MS_WINCE)
-#  include <stdlib.h>
-#  define strdup _strdup
-#endif
-
-#ifdef MS_WINCE
-/* Windows CE does not support environment variables */
-#define getenv(v) (NULL)
-#define environ (NULL)
-#endif
-
-/* Compiler specific defines */
-
-/* ------------------------------------------------------------------------*/
-/* Microsoft C defines _MSC_VER */
-#ifdef _MSC_VER
-
-/* We want COMPILER to expand to a string containing _MSC_VER's *value*.
- * This is horridly tricky, because the stringization operator only works
- * on macro arguments, and doesn't evaluate macros passed *as* arguments.
- * Attempts simpler than the following appear doomed to produce "_MSC_VER"
- * literally in the string.
- */
-#define _Py_PASTE_VERSION(SUFFIX) \
-	("[MSC v." _Py_STRINGIZE(_MSC_VER) " " SUFFIX "]")
-/* e.g., this produces, after compile-time string catenation,
- * 	("[MSC v.1200 32 bit (Intel)]")
- *
- * _Py_STRINGIZE(_MSC_VER) expands to
- * _Py_STRINGIZE1((_MSC_VER)) expands to
- * _Py_STRINGIZE2(_MSC_VER) but as this call is the result of token-pasting
- *      it's scanned again for macros and so further expands to (under MSVC 6)
- * _Py_STRINGIZE2(1200) which then expands to
- * "1200"
- */
-#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
-#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
-#define _Py_STRINGIZE2(X) #X
-
-/* MSVC defines _WINxx to differentiate the windows platform types
-
-   Note that for compatibility reasons _WIN32 is defined on Win32
-   *and* on Win64. For the same reasons, in Python, MS_WIN32 is
-   defined on Win32 *and* Win64. Win32 only code must therefore be
-   guarded as follows:
-   	#if defined(MS_WIN32) && !defined(MS_WIN64)
-   Some modules are disabled on Itanium processors, therefore we
-   have MS_WINI64 set for those targets, otherwise MS_WINX64
-*/
-#ifdef _WIN64
-#define MS_WIN64
-#endif
-
-/* set the COMPILER */
-#ifdef MS_WIN64
-#if defined(_M_IA64)
-#define COMPILER _Py_PASTE_VERSION("64 bit (Itanium)")
-#define MS_WINI64
-#elif defined(_M_X64) || defined(_M_AMD64)
-#define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)")
-#define MS_WINX64
-#else
-#define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)")
-#endif
-#endif /* MS_WIN64 */
-
-/* set the version macros for the windows headers */
-#ifdef MS_WINX64
-/* 64 bit only runs on XP or greater */
-#define Py_WINVER 0x0501 /* _WIN32_WINNT_WINXP */
-#define Py_NTDDI NTDDI_WINXP
-#else
-/* Python 2.6+ requires Windows 2000 or greater */
-#define Py_WINVER 0x0500 /* _WIN32_WINNT_WIN2K */
-#define Py_NTDDI NTDDI_WIN2KSP4
-#endif
-
-/* We only set these values when building Python - we don't want to force
-   these values on extensions, as that will affect the prototypes and
-   structures exposed in the Windows headers. Even when building Python, we
-   allow a single source file to override this - they may need access to
-   structures etc so it can optionally use new Windows features if it
-   determines at runtime they are available.
-*/
-#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE)
-#ifndef NTDDI_VERSION
-#define NTDDI_VERSION Py_NTDDI
-#endif
-#ifndef WINVER
-#define WINVER Py_WINVER
-#endif
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT Py_WINVER
-#endif
-#endif
-
-/* _W64 is not defined for VC6 or eVC4 */
-#ifndef _W64
-#define _W64
-#endif
-
-/* Define like size_t, omitting the "unsigned" */
-#ifdef MS_WIN64
-typedef __int64 ssize_t;
-#else
-typedef _W64 int ssize_t;
-#endif
-#define HAVE_SSIZE_T 1
-
-#if defined(MS_WIN32) && !defined(MS_WIN64)
-#ifdef _M_IX86
-#define COMPILER _Py_PASTE_VERSION("32 bit (Intel)")
-#else
-#define COMPILER _Py_PASTE_VERSION("32 bit (Unknown)")
-#endif
-#endif /* MS_WIN32 && !MS_WIN64 */
-
-typedef int pid_t;
-
-#include <float.h>
-#define Py_IS_NAN _isnan
-#define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X))
-#define Py_IS_FINITE(X) _finite(X)
-#define copysign _copysign
-#define hypot _hypot
-
-/* Side by Side assemblies supported in VS 2005 and VS 2008 but not 2010*/
-#if _MSC_VER >= 1400 && _MSC_VER < 1600
-#define HAVE_SXS 1
-#endif
-
-/* define some ANSI types that are not defined in earlier Win headers */
-#if _MSC_VER >= 1200
-/* This file only exists in VC 6.0 or higher */
-#include <basetsd.h>
-#endif
-
-#endif /* _MSC_VER */
-
-/* ------------------------------------------------------------------------*/
-/* The Borland compiler defines __BORLANDC__ */
-/* XXX These defines are likely incomplete, but should be easy to fix. */
-#ifdef __BORLANDC__
-#define COMPILER "[Borland]"
-
-#ifdef _WIN32
-/* tested with BCC 5.5 (__BORLANDC__ >= 0x0550)
- */
-
-typedef int pid_t;
-/* BCC55 seems to understand __declspec(dllimport), it is used in its
-   own header files (winnt.h, ...) - so we can do nothing and get the default*/
-
-#undef HAVE_SYS_UTIME_H
-#define HAVE_UTIME_H
-#define HAVE_DIRENT_H
-
-/* rename a few functions for the Borland compiler */
-#include <io.h>
-#define _chsize chsize
-#define _setmode setmode
-
-#else /* !_WIN32 */
-#error "Only Win32 and later are supported"
-#endif /* !_WIN32 */
-
-#endif /* BORLANDC */
-
-/* ------------------------------------------------------------------------*/
-/* egcs/gnu-win32 defines __GNUC__ and _WIN32 */
-#if defined(__GNUC__) && defined(_WIN32)
-/* XXX These defines are likely incomplete, but should be easy to fix.
-   They should be complete enough to build extension modules. */
-/* Suggested by Rene Liebscher <[e-mail]> to avoid a GCC 2.91.*
-   bug that requires structure imports.  More recent versions of the
-   compiler don't exhibit this bug.
-*/
-#if (__GNUC__==2) && (__GNUC_MINOR__<=91)
-#warning "Please use an up-to-date version of gcc! (>2.91 recommended)"
-#endif
-
-#define COMPILER "[gcc]"
-#define hypot _hypot
-#define PY_LONG_LONG long long
-#define PY_LLONG_MIN LLONG_MIN
-#define PY_LLONG_MAX LLONG_MAX
-#define PY_ULLONG_MAX ULLONG_MAX
-#endif /* GNUC */
-
-/* ------------------------------------------------------------------------*/
-/* lcc-win32 defines __LCC__ */
-#if defined(__LCC__)
-/* XXX These defines are likely incomplete, but should be easy to fix.
-   They should be complete enough to build extension modules. */
-
-#define COMPILER "[lcc-win32]"
-typedef int pid_t;
-/* __declspec() is supported here too - do nothing to get the defaults */
-
-#endif /* LCC */
-
-/* ------------------------------------------------------------------------*/
-/* End of compilers - finish up */
-
-#ifndef NO_STDIO_H
-#	include <stdio.h>
-#endif
-
-/* 64 bit ints are usually spelt __int64 unless compiler has overridden */
-#define HAVE_LONG_LONG 1
-#ifndef PY_LONG_LONG
-#	define PY_LONG_LONG __int64
-#	define PY_LLONG_MAX _I64_MAX
-#	define PY_LLONG_MIN _I64_MIN
-#	define PY_ULLONG_MAX _UI64_MAX
-#endif
-
-/* For Windows the Python core is in a DLL by default.  Test
-Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
-#if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED)
-#	define Py_ENABLE_SHARED 1 /* standard symbol for shared library */
-#	define MS_COREDLL	/* deprecated old symbol */
-#endif /* !MS_NO_COREDLL && ... */
-
-/*  All windows compilers that use this header support __declspec */
-#define HAVE_DECLSPEC_DLL
-
-/* For an MSVC DLL, we can nominate the .lib files used by extensions */
-#ifdef MS_COREDLL
-#	ifndef Py_BUILD_CORE /* not building the core - must be an ext */
-#		if defined(_MSC_VER)
-			/* So MSVC users need not specify the .lib file in
-			their Makefile (other compilers are generally
-			taken care of by distutils.) */
-#			if defined(_DEBUG)
-#				pragma comment(lib,"python33.lib")
-#			elif defined(Py_LIMITED_API)
-#				pragma comment(lib,"python3.lib")
-#			else
-#				pragma comment(lib,"python33.lib")
-#			endif /* _DEBUG */
-#		endif /* _MSC_VER */
-#	endif /* Py_BUILD_CORE */
-#endif /* MS_COREDLL */
-
-#if defined(MS_WIN64)
-/* maintain "win32" sys.platform for backward compatibility of Python code,
-   the Win64 API should be close enough to the Win32 API to make this
-   preferable */
-#	define PLATFORM "win32"
-#	define SIZEOF_VOID_P 8
-#	define SIZEOF_TIME_T 8
-#	define SIZEOF_OFF_T 4
-#	define SIZEOF_FPOS_T 8
-#	define SIZEOF_HKEY 8
-#	define SIZEOF_SIZE_T 8
-/* configure.ac defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG,
-   sizeof(off_t) > sizeof(long), and sizeof(PY_LONG_LONG) >= sizeof(off_t).
-   On Win64 the second condition is not true, but if fpos_t replaces off_t
-   then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64
-   should define this. */
-#	define HAVE_LARGEFILE_SUPPORT
-#elif defined(MS_WIN32)
-#	define PLATFORM "win32"
-#	define HAVE_LARGEFILE_SUPPORT
-#	define SIZEOF_VOID_P 4
-#	define SIZEOF_OFF_T 4
-#	define SIZEOF_FPOS_T 8
-#	define SIZEOF_HKEY 4
-#	define SIZEOF_SIZE_T 4
-	/* MS VS2005 changes time_t to an 64-bit type on all platforms */
-#	if defined(_MSC_VER) && _MSC_VER >= 1400
-#	define SIZEOF_TIME_T 8
-#	else
-#	define SIZEOF_TIME_T 4
-#	endif
-#endif
-
-#ifdef _DEBUG
-//#	define Py_DEBUG
-#endif
-
-
-#ifdef MS_WIN32
-
-#define SIZEOF_SHORT 2
-#define SIZEOF_INT 4
-#define SIZEOF_LONG 4
-#define SIZEOF_LONG_LONG 8
-#define SIZEOF_DOUBLE 8
-#define SIZEOF_FLOAT 4
-
-/* VC 7.1 has them and VC 6.0 does not.  VC 6.0 has a version number of 1200.
-   Microsoft eMbedded Visual C++ 4.0 has a version number of 1201 and doesn't
-   define these.
-   If some compiler does not provide them, modify the #if appropriately. */
-#if defined(_MSC_VER)
-#if _MSC_VER > 1300
-#define HAVE_UINTPTR_T 1
-#define HAVE_INTPTR_T 1
-#else
-/* VC6, VS 2002 and eVC4 don't support the C99 LL suffix for 64-bit integer literals */
-#define Py_LL(x) x##I64
-#endif  /* _MSC_VER > 1200  */
-#endif  /* _MSC_VER */
-
-#endif
-
-/* define signed and unsigned exact-width 32-bit and 64-bit types, used in the
-   implementation of Python long integers. */
-#ifndef PY_UINT32_T
-#if SIZEOF_INT == 4
-#define HAVE_UINT32_T 1
-#define PY_UINT32_T unsigned int
-#elif SIZEOF_LONG == 4
-#define HAVE_UINT32_T 1
-#define PY_UINT32_T unsigned long
-#endif
-#endif
-
-#ifndef PY_UINT64_T
-#if SIZEOF_LONG_LONG == 8
-#define HAVE_UINT64_T 1
-#define PY_UINT64_T unsigned PY_LONG_LONG
-#endif
-#endif
-
-#ifndef PY_INT32_T
-#if SIZEOF_INT == 4
-#define HAVE_INT32_T 1
-#define PY_INT32_T int
-#elif SIZEOF_LONG == 4
-#define HAVE_INT32_T 1
-#define PY_INT32_T long
-#endif
-#endif
-
-#ifndef PY_INT64_T
-#if SIZEOF_LONG_LONG == 8
-#define HAVE_INT64_T 1
-#define PY_INT64_T PY_LONG_LONG
-#endif
-#endif
-
-/* Fairly standard from here! */
-
-/* Define to 1 if you have the `copysign' function. */
-#define HAVE_COPYSIGN 1
-
-/* Define to 1 if you have the `isinf' macro. */
-#define HAVE_DECL_ISINF 1
-
-/* Define to 1 if you have the `isnan' function. */
-#define HAVE_DECL_ISNAN 1
-
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
-
-/* Define to empty if the keyword does not work.  */
-/* #define const  */
-
-/* Define to 1 if you have the <conio.h> header file. */
-#ifndef MS_WINCE
-#define HAVE_CONIO_H 1
-#endif
-
-/* Define to 1 if you have the <direct.h> header file. */
-#ifndef MS_WINCE
-#define HAVE_DIRECT_H 1
-#endif
-
-/* Define if you have dirent.h.  */
-/* #define DIRENT 1 */
-
-/* Define to the type of elements in the array set by `getgroups'.
-   Usually this is either `int' or `gid_t'.  */
-/* #undef GETGROUPS_T */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef gid_t */
-
-/* Define if your struct tm has tm_zone.  */
-/* #undef HAVE_TM_ZONE */
-
-/* Define if you don't have tm_zone but do have the external array
-   tzname.  */
-#define HAVE_TZNAME
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef mode_t */
-
-/* Define if you don't have dirent.h, but have ndir.h.  */
-/* #undef NDIR */
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
-
-/* Define if the system does not provide POSIX.1 features except
-   with this defined.  */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if you don't have dirent.h, but have sys/dir.h.  */
-/* #undef SYSDIR */
-
-/* Define if you don't have dirent.h, but have sys/ndir.h.  */
-/* #undef SYSNDIR */
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-/* #undef TIME_WITH_SYS_TIME */
-
-/* Define if your <sys/time.h> declares struct tm.  */
-/* #define TM_IN_SYS_TIME 1 */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef uid_t */
-
-/* Define if the closedir function returns void instead of int.  */
-/* #undef VOID_CLOSEDIR */
-
-/* Define if getpgrp() must be called as getpgrp(0)
-   and (consequently) setpgrp() as setpgrp(0, 0). */
-/* #undef GETPGRP_HAVE_ARGS */
-
-/* Define this if your time.h defines altzone */
-/* #define HAVE_ALTZONE */
-
-/* Define if you have the putenv function.  */
-#ifndef MS_WINCE
-#define HAVE_PUTENV
-#endif
-
-/* Define if your compiler supports function prototypes */
-#define HAVE_PROTOTYPES
-
-/* Define if  you can safely include both <sys/select.h> and <sys/time.h>
-   (which you can't on SCO ODT 3.0). */
-/* #undef SYS_SELECT_WITH_SYS_TIME */
-
-/* Define if you want documentation strings in extension modules */
-#define WITH_DOC_STRINGS 1
-
-/* Define if you want to compile in rudimentary thread support */
-/* #undef WITH_THREAD */
-
-/* Define if you want to use the GNU readline library */
-/* #define WITH_READLINE 1 */
-
-/* Use Python's own small-block memory-allocator. */
-#define WITH_PYMALLOC 1
-
-/* Define if you have clock.  */
-/* #define HAVE_CLOCK */
-
-/* Define when any dynamic module loading is enabled */
-#define HAVE_DYNAMIC_LOADING
-
-/* Define if you have ftime.  */
-#ifndef MS_WINCE
-#define HAVE_FTIME
-#endif
-
-/* Define if you have getpeername.  */
-#define HAVE_GETPEERNAME
-
-/* Define if you have getpgrp.  */
-/* #undef HAVE_GETPGRP */
-
-/* Define if you have getpid.  */
-#ifndef MS_WINCE
-#define HAVE_GETPID
-#endif
-
-/* Define if you have gettimeofday.  */
-/* #undef HAVE_GETTIMEOFDAY */
-
-/* Define if you have getwd.  */
-/* #undef HAVE_GETWD */
-
-/* Define if you have lstat.  */
-/* #undef HAVE_LSTAT */
-
-/* Define if you have the mktime function.  */
-#define HAVE_MKTIME
-
-/* Define if you have nice.  */
-/* #undef HAVE_NICE */
-
-/* Define if you have readlink.  */
-/* #undef HAVE_READLINK */
-
-/* Define if you have select.  */
-/* #undef HAVE_SELECT */
-
-/* Define if you have setpgid.  */
-/* #undef HAVE_SETPGID */
-
-/* Define if you have setpgrp.  */
-/* #undef HAVE_SETPGRP */
-
-/* Define if you have setsid.  */
-/* #undef HAVE_SETSID */
-
-/* Define if you have setvbuf.  */
-#define HAVE_SETVBUF
-
-/* Define if you have siginterrupt.  */
-/* #undef HAVE_SIGINTERRUPT */
-
-/* Define if you have symlink.  */
-/* #undef HAVE_SYMLINK */
-
-/* Define if you have tcgetpgrp.  */
-/* #undef HAVE_TCGETPGRP */
-
-/* Define if you have tcsetpgrp.  */
-/* #undef HAVE_TCSETPGRP */
-
-/* Define if you have times.  */
-/* #undef HAVE_TIMES */
-
-/* Define if you have uname.  */
-/* #undef HAVE_UNAME */
-
-/* Define if you have waitpid.  */
-/* #undef HAVE_WAITPID */
-
-/* Define to 1 if you have the `wcsftime' function. */
-#if defined(_MSC_VER) && _MSC_VER >= 1310
-#define HAVE_WCSFTIME 1
-#endif
-
-/* Define to 1 if you have the `wcscoll' function. */
-#ifndef MS_WINCE
-#define HAVE_WCSCOLL 1
-#endif
-
-/* Define to 1 if you have the `wcsxfrm' function. */
-#ifndef MS_WINCE
-#define HAVE_WCSXFRM 1
-#endif
-
-/* Define if the zlib library has inflateCopy */
-#define HAVE_ZLIB_COPY 1
-
-/* Define if you have the <dlfcn.h> header file.  */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the <errno.h> header file. */
-#ifndef MS_WINCE
-#define HAVE_ERRNO_H 1
-#endif
-
-/* Define if you have the <fcntl.h> header file.  */
-#ifndef MS_WINCE
-#define HAVE_FCNTL_H 1
-#endif
-
-/* Define to 1 if you have the <process.h> header file. */
-#ifndef MS_WINCE
-#define HAVE_PROCESS_H 1
-#endif
-
-/* Define to 1 if you have the <signal.h> header file. */
-#ifndef MS_WINCE
-#define HAVE_SIGNAL_H 1
-#endif
-
-/* Define if you have the <stdarg.h> prototypes.  */
-#define HAVE_STDARG_PROTOTYPES
-
-/* Define if you have the <stddef.h> header file.  */
-#define HAVE_STDDEF_H 1
-
-/* Define if you have the <sys/audioio.h> header file.  */
-/* #undef HAVE_SYS_AUDIOIO_H */
-
-/* Define if you have the <sys/param.h> header file.  */
-/* #define HAVE_SYS_PARAM_H 1 */
-
-/* Define if you have the <sys/select.h> header file.  */
-/* #define HAVE_SYS_SELECT_H 1 */
-
-/* Define to 1 if you have the <sys/stat.h> header file.  */
-#ifndef MS_WINCE
-#define HAVE_SYS_STAT_H 1
-#endif
-
-/* Define if you have the <sys/time.h> header file.  */
-/* #define HAVE_SYS_TIME_H 1 */
-
-/* Define if you have the <sys/times.h> header file.  */
-/* #define HAVE_SYS_TIMES_H 1 */
-
-/* Define to 1 if you have the <sys/types.h> header file.  */
-#ifndef MS_WINCE
-#define HAVE_SYS_TYPES_H 1
-#endif
-
-/* Define if you have the <sys/un.h> header file.  */
-/* #define HAVE_SYS_UN_H 1 */
-
-/* Define if you have the <sys/utime.h> header file.  */
-/* #define HAVE_SYS_UTIME_H 1 */
-
-/* Define if you have the <sys/utsname.h> header file.  */
-/* #define HAVE_SYS_UTSNAME_H 1 */
-
-/* Define if you have the <unistd.h> header file.  */
-/* #define HAVE_UNISTD_H 1 */
-
-/* Define if you have the <utime.h> header file.  */
-/* #define HAVE_UTIME_H 1 */
-
-/* Define if the compiler provides a wchar.h header file. */
-#define HAVE_WCHAR_H 1
-
-/* The size of `wchar_t', as computed by sizeof. */
-#define SIZEOF_WCHAR_T 2
-
-/* Define if you have the dl library (-ldl).  */
-/* #undef HAVE_LIBDL */
-
-/* Define if you have the mpc library (-lmpc).  */
-/* #undef HAVE_LIBMPC */
-
-/* Define if you have the nsl library (-lnsl).  */
-#define HAVE_LIBNSL 1
-
-/* Define if you have the seq library (-lseq).  */
-/* #undef HAVE_LIBSEQ */
-
-/* Define if you have the socket library (-lsocket).  */
-#define HAVE_LIBSOCKET 1
-
-/* Define if you have the sun library (-lsun).  */
-/* #undef HAVE_LIBSUN */
-
-/* Define if you have the termcap library (-ltermcap).  */
-/* #undef HAVE_LIBTERMCAP */
-
-/* Define if you have the termlib library (-ltermlib).  */
-/* #undef HAVE_LIBTERMLIB */
-
-/* Define if you have the thread library (-lthread).  */
-/* #undef HAVE_LIBTHREAD */
-
-/* WinSock does not use a bitmask in select, and uses
-   socket handles greater than FD_SETSIZE */
-#define Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE
-
-/* Define if C doubles are 64-bit IEEE 754 binary format, stored with the
-   least significant byte first */
-#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1
-
-#endif /* !Py_CONFIG_H */

=== removed file 'win_fix/readme.txt'
--- win_fix/readme.txt	2014-01-20 14:29:21 +0000
+++ win_fix/readme.txt	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-The Python distro does not come packaged with the debug
-library: "pythonXX_d.lib". So, in order to get ECS:Python
-to compile in Debug mode:
-
-copy: "DEBUG Fix\PythonXX\pyconfig.h"
-to: "PYTHON_ROOT\include\"
\ No newline at end of file