Revision: 515
http://rpy.svn.sourceforge.net/rpy/?rev=515&view=rev
Author: warnes
Date: 2008-05-14 06:53:05 -0700 (Wed, 14 May 2008)
Log Message:
-----------
Minor changes to remove compilation warnings
Modified Paths:
--------------
trunk/rpy/src/RPy.h
trunk/rpy/src/io.c
trunk/rpy/src/rpymodule.c
Modified: trunk/rpy/src/RPy.h
===================================================================
--- trunk/rpy/src/RPy.h 2008-05-13 03:47:51 UTC (rev 514)
+++ trunk/rpy/src/RPy.h 2008-05-14 13:53:05 UTC (rev 515)
@@ -52,6 +52,13 @@
#include <Rdefines.h>
#include <Rinternals.h>
#include <Rversion.h>
+
+#if (R_VERSION >= R_Version(2,4,0))
+#include <Rembedded.h>
+#endif
+
+
+
#undef _POSIX_C_SOURCE
#include <Python.h>
#include <R_ext/Rdynload.h>
Modified: trunk/rpy/src/io.c
===================================================================
--- trunk/rpy/src/io.c 2008-05-13 03:47:51 UTC (rev 514)
+++ trunk/rpy/src/io.c 2008-05-14 13:53:05 UTC (rev 515)
@@ -130,7 +130,7 @@
PyErr_Clear();
return 0;
}
- snprintf(buf, len, "%s", PyString_AsString(input_data));
+ snprintf( (char*) buf, len, "%s", PyString_AsString(input_data));
Py_DECREF(input_data);
return 1;
}
Modified: trunk/rpy/src/rpymodule.c
===================================================================
--- trunk/rpy/src/rpymodule.c 2008-05-13 03:47:51 UTC (rev 514)
+++ trunk/rpy/src/rpymodule.c 2008-05-14 13:53:05 UTC (rev 515)
@@ -1772,8 +1772,10 @@
void r_finalize(void)
{
+#if (R_VERSION < R_Version(2,4,0))
unsigned char buf[1024];
char * tmpdir;
+#endif
R_dot_Last();
R_RunExitFinalizers();
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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
