List:       py2exe-checkins
Subject:    [Py2exe-checkins] SF.net SVN: py2exe:[688] trunk/py2exe
From:       theller () users ! sourceforge ! net
Date:       2010-04-26 7:22:49
Message-ID: E1O6IeX-0007J8-NU () sfp-svn-6 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 688
          http://py2exe.svn.sourceforge.net/py2exe/?rev=688&view=rev
Author:   theller
Date:     2010-04-26 07:22:49 +0000 (Mon, 26 Apr 2010)

Log Message:
-----------
Fix compiler warnings.

Modified Paths:
--------------
    trunk/py2exe/setup.py
    trunk/py2exe/source/MemoryModule.c
    trunk/py2exe/source/py2exe_util.c

Modified: trunk/py2exe/setup.py
===================================================================
--- trunk/py2exe/setup.py	2009-08-14 19:43:50 UTC (rev 687)
+++ trunk/py2exe/setup.py	2010-04-26 07:22:49 UTC (rev 688)
@@ -332,10 +332,12 @@
 
 if _is_debug_build():
     macros = [("PYTHONDLL", '\\"PYTHON%d%d_d.DLL\\"' % sys.version_info[:2]),
-              ("PYTHONCOM", '\\"pythoncom%d%d_d.dll\\"' % sys.version_info[:2])]
+              ("PYTHONCOM", '\\"pythoncom%d%d_d.dll\\"' % sys.version_info[:2]),
+              ("_CRT_SECURE_NO_WARNINGS", '1')]
 else:
     macros = [("PYTHONDLL", '\\"PYTHON%d%d.DLL\\"' % sys.version_info[:2]),
-              ("PYTHONCOM", '\\"pythoncom%d%d.dll\\"' % sys.version_info[:2])]
+              ("PYTHONCOM", '\\"pythoncom%d%d.dll\\"' % sys.version_info[:2]),
+              ("_CRT_SECURE_NO_WARNINGS", '1')]
 if 'zlib' in sys.builtin_module_names:
     macros.append(("PYZLIB_BUILTIN", None))
 

Modified: trunk/py2exe/source/MemoryModule.c
===================================================================
--- trunk/py2exe/source/MemoryModule.c	2009-08-14 19:43:50 UTC (rev 687)
+++ trunk/py2exe/source/MemoryModule.c	2010-04-26 07:22:49 UTC (rev 688)
@@ -102,7 +102,7 @@
 	MEMORYMODULE *p = loaded;
 	while (p) {
 		// If already loaded, only increment the reference count
-		if (0 == stricmp(lpModuleName, p->name)) {
+		if (0 == _stricmp(lpModuleName, p->name)) {
 			return (HMODULE)p;
 		}
 		p = p->next;
@@ -121,7 +121,7 @@
 
 	while (p) {
 		// If already loaded, only increment the reference count
-		if (0 == stricmp(lpFileName, p->name)) {
+		if (0 == _stricmp(lpFileName, p->name)) {
 			p->refcount++;
 			return (HMODULE)p;
 		}
@@ -435,7 +435,7 @@
 
 	while (p) {
 		// If already loaded, only increment the reference count
-		if (0 == stricmp(name, p->name)) {
+		if (0 == _stricmp(name, p->name)) {
 			p->refcount++;
 			return (HMODULE)p;
 		}
@@ -493,7 +493,7 @@
 	result->initialized = 0;
 	result->next = result->prev = NULL;
 	result->refcount = 1;
-	result->name = strdup(name);
+	result->name = _strdup(name);
 	result->name_table = NULL;
 
 	// XXX: is it correct to commit the complete memory region at once?
@@ -570,12 +570,12 @@
 
 int _compare(const struct NAME_TABLE *p1, const struct NAME_TABLE *p2)
 {
-	return stricmp(p1->name, p2->name);
+	return _stricmp(p1->name, p2->name);
 }
 
 int _find(const char **name, const struct NAME_TABLE *p)
 {
-	return stricmp(*name, p->name);
+	return _stricmp(*name, p->name);
 }
 
 struct NAME_TABLE *GetNameTable(PMEMORYMODULE module)

Modified: trunk/py2exe/source/py2exe_util.c
===================================================================
--- trunk/py2exe/source/py2exe_util.c	2009-08-14 19:43:50 UTC (rev 687)
+++ trunk/py2exe/source/py2exe_util.c	2010-04-26 07:22:49 UTC (rev 688)
@@ -430,8 +430,8 @@
 BOOL __stdcall StatusRoutine(IMAGEHLP_STATUS_REASON reason,
 			  PSTR ImageName,
 			  PSTR DllName,
-			  ULONG Va,
-			  ULONG Parameter)
+			  ULONG_PTR Va,
+			  ULONG_PTR Parameter)
 {
     DWORD result;
 


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
_______________________________________________
Py2exe-checkins mailing list
Py2exe-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/py2exe-checkins