Revision: 362
http://rpy.svn.sourceforge.net/rpy/?rev=362&view=rev
Author: warnes
Date: 2007-11-06 08:49:53 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
Apply patch submitted by Matthew Brett to resolve array size issues on 64 bit
platforms
Modified Paths:
--------------
trunk/rpy/src/RPy.h
trunk/rpy/src/rpymodule.c
Modified: trunk/rpy/src/RPy.h
===================================================================
--- trunk/rpy/src/RPy.h 2007-10-18 19:40:51 UTC (rev 361)
+++ trunk/rpy/src/RPy.h 2007-11-06 16:49:53 UTC (rev 362)
@@ -91,12 +91,16 @@
# if WITH_NUMERIC == 3
# include "numpy/arrayobject.h"
# define PY_ARRAY_MODULE_NAME "numpy"
+typedef npy_intp n_intp;
# elif WITH_NUMERIC == 1
# include "Numeric/arrayobject.h"
# define PY_ARRAY_MODULE_NAME "multiarray"
+typedef int n_intp;
# else
# error "unknown array variant"
# endif
+#else
+typedef int n_intp;
#endif
#define xstr(s) str(s)
#define str(s) #s
Modified: trunk/rpy/src/rpymodule.c
===================================================================
--- trunk/rpy/src/rpymodule.c 2007-10-18 19:40:51 UTC (rev 361)
+++ trunk/rpy/src/rpymodule.c 2007-11-06 16:49:53 UTC (rev 362)
@@ -314,7 +314,8 @@
PyObject *pytl, *nobj;
PyArrayObject *obj;
SEXP Rdims, tRdims, Rarray, e;
- int *dims, i;
+ n_intp *dims;
+ int i;
long tl;
obj = (PyArrayObject *)o;
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: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
