Update of /cvsroot/pywin32/pywin32/com/win32com/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16059
Modified Files:
dllmain.cpp
Log Message:
Fix case of a few #includes, and remove DLLMAIN macro hell that was used
for freeze (but should no longer be necessary, as a) freeze is dead, and
(b) a /D option should be able to do the same magic.
Index: dllmain.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/dllmain.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dllmain.cpp 7 Jul 2003 14:10:53 -0000 1.9
--- dllmain.cpp 31 Oct 2003 02:46:29 -0000 1.10
***************
*** 6,11 ****
#include <Python.h>
! #include <PythonRun.h> /* for Py_Initialize() */
! #include <Import.h> /* for PyImport_GetModuleDict() */
#include "PythonCOM.h"
--- 6,11 ----
#include <Python.h>
! #include <pythonrun.h> /* for Py_Initialize() */
! #include <import.h> /* for PyImport_GetModuleDict() */
#include "PythonCOM.h"
***************
*** 107,124 ****
static BOOL g_bCoInitThreadHasInit = FALSE;
- #ifndef BUILD_FREEZE
- #define DLLMAIN DllMain
- #define DLLMAIN_DECL
- #else
- #define DLLMAIN DllMainpythoncom
- #define DLLMAIN_DECL __declspec(dllexport)
- #endif
-
#ifndef MS_WINCE
! extern "C" DLLMAIN_DECL
! BOOL WINAPI DLLMAIN(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
#else
! DLLMAIN_DECL
! BOOL WINAPI DLLMAIN(HANDLE hInstance, DWORD dwReason, LPVOID lpReserved)
#endif
{
--- 107,115 ----
static BOOL g_bCoInitThreadHasInit = FALSE;
#ifndef MS_WINCE
! extern "C" __declspec(dllexport)
! BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
#else
! BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwReason, LPVOID lpReserved)
#endif
{
|
