[rkward-cvs] SF.net SVN: rkward: [1921] trunk/rkward/rkward

[tfry at users.sourceforge.net]

Revision: 1921
          http://svn.sourceforge.net/rkward/?rev=1921&view=rev
Author:   tfry
Date:     2007-05-24 03:42:56 -0700 (Thu, 24 May 2007)

Log Message:
-----------
Compilation fix for R 2.6.0

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rembedinternal.cpp
    trunk/rkward/rkward/rkwardui.rc

Modified: trunk/rkward/rkward/rbackend/rembedinternal.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-05-23 11:11:08 UTC (rev 1920)
+++ trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-05-24 10:42:56 UTC (rev 1921)
@@ -75,6 +75,10 @@
 #define R_2_5
 #endif
 
+#if (R_VERSION > R_Version(2, 5, 9))
+#define R_2_6
+#endif
+
 #ifdef R_2_4
 #define USE_R_REPLDLLDO1
 #endif
@@ -83,6 +87,12 @@
 #define USE_ENCODING_HINTS
 #endif
 
+#ifdef R_2_6
+// hidden in Rinternals.h is USE_RINTERNALS is defined
+extern Rboolean (Rf_isNull)(SEXP s);
+extern Rboolean (Rf_isObject)(SEXP s);
+#endif
+
 #ifdef R_2_4
 #include "Rembedded.h"
 #else

Modified: trunk/rkward/rkward/rkwardui.rc
===================================================================
--- trunk/rkward/rkward/rkwardui.rc	2007-05-23 11:11:08 UTC (rev 1920)
+++ trunk/rkward/rkward/rkwardui.rc	2007-05-24 10:42:56 UTC (rev 1921)
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.4.7">
+<kpartgui name="rkward" version="0.4.8">
 <MenuBar>
 	<Menu name="file"><text>&File</text>
 		<Menu name="new_data"><text>&New</text>


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