Skip to content

Commit 8c9618e

Browse files
committed
bump version to 1.0-14
1 parent ef046ea commit 8c9618e

1 file changed

Lines changed: 20 additions & 1 deletion

File tree

src/rJava.h

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef __RJAVA_H__
22
#define __RJAVA_H__
33

4-
#define RJAVA_VER 0x01000d /* rJava v1.0-13 */
4+
#define RJAVA_VER 0x01000e /* rJava v1.0-14 */
55

66
/* important changes between versions:
77
3.0 - adds compiler
@@ -27,6 +27,25 @@
2727
#include <Rdefines.h>
2828
#include <R_ext/Callbacks.h>
2929

30+
#include <Rversion.h>
31+
32+
/* R API compatibility re-mapping */
33+
#if (R_VERSION >= R_Version(2,0,0))
34+
/* EXTPTR */
35+
#ifdef EXTPTR_PTR
36+
#undef EXTPTR_PTR
37+
#endif
38+
#define EXTPTR_PTR(X) R_ExternalPtrAddr(X)
39+
#ifdef EXTPTR_PROT
40+
#undef EXTPTR_PROT
41+
#endif
42+
#define EXTPTR_PROT(X) R_ExternalPtrProtected(X)
43+
#ifdef EXTPTR_TAG
44+
#undef EXTPTR_TAG
45+
#endif
46+
#define EXTPTR_TAG(X) R_ExternalPtrTag(X)
47+
#endif
48+
3049
/* flags used in function declarations:
3150
HIDE - hidden (used internally in rJava only)
3251

0 commit comments

Comments
 (0)