[Rinside-commits] r86 - pkg/src

[noreply at r-forge.r-project.org]

Author: edd
Date: 2010-01-29 02:47:05 +0100 (Fri, 29 Jan 2010)
New Revision: 86

Modified:
   pkg/src/Makefile
   pkg/src/RInside.h
Log:
correction to Makefile to find Rcpp.h as we now include it (do we need to or should we copy the few defines ?)
one more fix to logTxt -- undefine if defined


Modified: pkg/src/Makefile
===================================================================
--- pkg/src/Makefile	2010-01-29 01:37:53 UTC (rev 85)
+++ pkg/src/Makefile	2010-01-29 01:47:05 UTC (rev 86)
@@ -42,8 +42,8 @@
 RCPPINCL := 		$(shell echo 'Rcpp:::CxxFlags()' | $(R_HOME)/bin/R --vanilla --slave)
 
 CXX := 			$(shell $(R_HOME)/bin/R CMD config CXX)
-CPPFLAGS := 		-Wall $(shell $(R_HOME)/bin/R CMD config CPPFLAGS)
-CXXFLAGS := 		-I. $(RCPPFLAGS) $(RCPPINCL) $(shell $(R_HOME)/bin/R CMD config CXXFLAGS)
+CPPFLAGS := 		-Wall $(RCPPFLAGS) $(RCPPINCL) 
+CXXFLAGS := 		-I. $(RCPPFLAGS) $(shell $(R_HOME)/bin/R CMD config CXXFLAGS)
 LDFLAGS	= 		-s
 LDLIBS = 		$(RLDFLAGS)
 

Modified: pkg/src/RInside.h
===================================================================
--- pkg/src/RInside.h	2010-01-29 01:37:53 UTC (rev 85)
+++ pkg/src/RInside.h	2010-01-29 01:47:05 UTC (rev 86)
@@ -71,7 +71,8 @@
     }
 }
 
-#ifndef logTxT
+#ifdef logTxt
+#undef logTxt
+#endif
 //#define logTxt(x, b) logTxtFunction(__FILE__, __LINE__, x, b);
 #define logTxt(x, b) 
-#endif