[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16297] branches/apricot/source/gameengine /Ketsji/KX_PythonInit.cpp: svn merge -r 16295:HEAD https://svn.blender.org/ svnroot/bf-blender/trunk/blender

[Campbell Barton]

Revision: 16297
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16297
Author:   campbellbarton
Date:     2008-08-29 08:36:11 +0200 (Fri, 29 Aug 2008)

Log Message:
-----------
svn merge -r 16295:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/apricot/source/gameengine/Ketsji/KX_PythonInit.cpp

Modified: branches/apricot/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- branches/apricot/source/gameengine/Ketsji/KX_PythonInit.cpp	2008-08-29 06:32:42 UTC (rev 16296)
+++ branches/apricot/source/gameengine/Ketsji/KX_PythonInit.cpp	2008-08-29 06:36:11 UTC (rev 16297)
@@ -1136,7 +1136,7 @@
 static PyObject* gPyEventToString(PyObject*, PyObject* value)
 {
 	PyObject* mod, *dict, *key, *val, *ret = NULL;
-	int pos = 0;
+	Py_ssize_t pos = 0;
 	
 	mod = PyImport_ImportModule( "GameKeys" );
 	if (!mod)