Revision: 620
          http://rpy.svn.sourceforge.net/rpy/?rev=620&view=rev
Author:   lgautier
Date:     2008-08-07 17:33:42 +0000 (Thu, 07 Aug 2008)

Log Message:
-----------
Moving conditional definition for Python versions < 2.5
from rinterface.c to rinterface.h

Modified Paths:
--------------
    branches/rpy_nextgen/rpy/rinterface/rinterface.c
    branches/rpy_nextgen/rpy/rinterface/rinterface.h

Modified: branches/rpy_nextgen/rpy/rinterface/rinterface.c
===================================================================
--- branches/rpy_nextgen/rpy/rinterface/rinterface.c    2008-08-07 15:52:28 UTC 
(rev 619)
+++ branches/rpy_nextgen/rpy/rinterface/rinterface.c    2008-08-07 17:33:42 UTC 
(rev 620)
@@ -80,13 +80,6 @@
 #endif
 
 
-/* Back-compatibility with Python 2.4 */
-#if (PY_VERSION_HEX < 0x02050000)
-typedef int Py_ssize_t;
-typedef inquiry lenfunc;
-typedef intargfunc ssizeargfunc;
-typedef intobjargproc ssizeobjargproc;
-#endif
 
 /* A sequence that holds options to initialize R */
 static PyObject *initOptions;

Modified: branches/rpy_nextgen/rpy/rinterface/rinterface.h
===================================================================
--- branches/rpy_nextgen/rpy/rinterface/rinterface.h    2008-08-07 15:52:28 UTC 
(rev 619)
+++ branches/rpy_nextgen/rpy/rinterface/rinterface.h    2008-08-07 17:33:42 UTC 
(rev 620)
@@ -5,7 +5,15 @@
 #include <R.h>
 #include <Python.h>
 
+/* Back-compatibility with Python 2.4 */
+#if (PY_VERSION_HEX < 0x02050000)
+typedef int Py_ssize_t;
+typedef inquiry lenfunc;
+typedef intargfunc ssizeargfunc;
+typedef intobjargproc ssizeobjargproc;
+#endif
 
+
 extern const unsigned int const RPY_R_INITIALIZED;
 extern const unsigned int const RPY_R_BUSY;
 


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

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list

Reply via email to