Browse code

fix compilation errors on windows

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/seqbias@57569 bc3139a8-67e5-0310-9ffc-ced21a209358

Daniel Jones authored on 19/08/2011 21:06:52
Showing 2 changed files

... ...
@@ -5,6 +5,11 @@
5 5
 #include <cstdarg>
6 6
 #include <cstdlib>
7 7
 
8
+/* when building against R, we need to de-pollute the namespace a bit: */
9
+#ifdef ERROR
10
+#undef ERROR
11
+#endif
12
+
8 13
 /** This is meant to be striped-down, more R-friendly mimic of the logger class
9 14
  * in isolator.
10 15
  */
... ...
@@ -7,6 +7,11 @@ extern "C" {
7 7
 #include "samtools/faidx.h"
8 8
 #include "samtools/sam.h"
9 9
 
10
+
11
+#ifdef ERROR
12
+#undef ERROR
13
+#endif
14
+
10 15
 #include <R.h>
11 16
 #include <Rinternals.h>
12 17
 #include <Rdefines.h>