Sulong: resolving merge conflicts

Author: Palez

com.oracle.truffle.r.native/fficall/src/common/rffi_upcalls.h

@@ -26,9 +26,6 @@
 #include "rffi_upcallsindex.h"
 #include <Rdynload.h>
 
-<<<<<<< HEAD
-extern void* *callbacks;
-=======
 #ifdef FASTR_NFI
 #define CALLBACKS_T __thread void**
 #elif FASTR_LLVM
@@ -38,7 +35,6 @@ extern void* *callbacks;
 #endif
 
 extern CALLBACKS_T callbacks;
->>>>>>> RFFI: do not declare the callbacks array as a thread local in LLVM
 
 // This is the complete set , including those not yet implemented
 

com.oracle.truffle.r.native/fficall/src/truffle_nfi/Rinternals.c

@@ -26,11 +26,7 @@
 #include <Rinternals_common.h>
 #include "../common/rffi_upcalls.h"
 
-<<<<<<< HEAD
-void **callbacks = NULL;
-=======
 CALLBACKS_T callbacks = NULL;
->>>>>>> RFFI: do not declare the callbacks array as a thread local in LLVM
 
 void Rinternals_addCallback(TruffleEnv* env, void** theCallbacks, int index, void *closure) {
         (*env)->newClosureRef(env, closure);