[rkward-cvs] SF.net SVN: rkward:[2738] trunk/rkward/rkward/rbackend/rembedinternal.cpp

tfry at users.sourceforge.net tfry at users.sourceforge.net
Thu Feb 11 20:29:11 UTC 2010


Revision: 2738
          http://rkward.svn.sourceforge.net/rkward/?rev=2738&view=rev
Author:   tfry
Date:     2010-02-11 20:29:11 +0000 (Thu, 11 Feb 2010)

Log Message:
-----------
Correct useage of brackets vs. spaces in includes. Rinterface.h seems to be confused with our rinterface.h on some systems.

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

Modified: trunk/rkward/rkward/rbackend/rembedinternal.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rembedinternal.cpp	2010-02-11 09:53:12 UTC (rev 2737)
+++ trunk/rkward/rkward/rbackend/rembedinternal.cpp	2010-02-11 20:29:11 UTC (rev 2738)
@@ -44,7 +44,7 @@
 #endif
 #include <math.h>
 
-#include "Rversion.h"
+#include <Rversion.h>
 
 #if (R_VERSION > R_Version(2, 6, 9))
 #define R_2_7
@@ -70,18 +70,18 @@
 #	define Win32
 #endif
 
-#include "Rdefines.h"
-#include "R_ext/Rdynload.h"
-#include "R_ext/eventloop.h"
-#include "R_ext/Callbacks.h"
-#include "R.h"
-#include "Rinternals.h"
-#include "R_ext/Parse.h"
-#include "Rembedded.h"
+#include <Rdefines.h>
+#include <R_ext/Rdynload.h>
+#include <R_ext/eventloop.h>
+#include <R_ext/Callbacks.h>
+#include <R.h>
+#include <Rinternals.h>
+#include <R_ext/Parse.h>
+#include <Rembedded.h>
 
 #ifdef Q_WS_WIN
-#	include "R_ext/RStartup.h"
-#	include "R_ext/Utils.h"
+#	include <R_ext/RStartup.h>
+#	include <R_ext/Utils.h>
 
 	void RK_scheduleIntr () {
 		UserBreak = 1;
@@ -95,7 +95,7 @@
 	structRstart RK_R_Params;
 #else
 #	define RK_doIntr Rf_onintr
-#	include "Rinterface.h"
+#	include <Rinterface.h>
 #endif
 
 // some functions we need that are not declared
@@ -108,7 +108,7 @@
 extern Rboolean R_Interactive;	// inRinterface.h in R 2.9.0. TODO: check presence in R 2.7.0
 #endif
 SEXP R_LastvalueSymbol;
-#include "R_ext/eventloop.h"
+#include <R_ext/eventloop.h>
 }
 
 #include "../rkglobals.h"


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




More information about the rkward-tracker mailing list