Permalink
Browse files

removed unused pthread dependency

  • Loading branch information...
1 parent f0a32e6 commit 4459d189f7692e28534752b6fa3378bbeb406149 @gmbecker committed Jul 16, 2012
Showing with 11 additions and 4 deletions.
  1. +7 −1 inst/NPAPI/BasicPlugin.cpp
  2. +1 −1 inst/NPAPI/Makefile.in
  3. +3 −2 inst/NPAPI/WebR.h
@@ -23,11 +23,12 @@
/* Structure containing pointers to functions implemented by the browser. */
NPNetscapeFuncs *myNPNFuncs;
+/*
pthread_mutex_t rMutex;
pthread_mutex_t queueMutex;
pthread_attr_t rThreadAttrs;
pthread_cond_t queueAdvance;
-
+*/
RCallQueue rQueue;
@@ -66,10 +67,12 @@ int initR( const char **args, int nargs)
R_CStackLimit = (uintptr_t)-1;
R_SignalHandlers = 0;
+ /*
pthread_mutex_init(&rMutex, NULL);
pthread_mutex_init(&queueMutex, NULL);
pthread_attr_init(&rThreadAttrs);
pthread_attr_setschedpolicy(&rThreadAttrs, SCHED_FIFO);
+ */
rQueue.init();
int error=0;
SEXP call;
@@ -179,6 +182,9 @@ void CopyNPNFunctions(NPNetscapeFuncs *dstFuncs, NPNetscapeFuncs *srcFuncs)
dstFuncs->releasevariantvalue = srcFuncs->releasevariantvalue;
dstFuncs->setexception = srcFuncs->setexception;
dstFuncs->construct = srcFuncs->construct;
+
+ //This was missing for some reason?!?!
+ dstFuncs->enumerate = srcFuncs->enumerate;
if (srcFuncs->version >= NPVERS_MACOSX_HAS_COCOA_EVENTS) { // 23
dstFuncs->scheduletimer = srcFuncs->scheduletimer;
@@ -44,7 +44,7 @@ IS_MAC=@IS_MAC@
CPPFLAGS = -Wall -O0 -DXP_UNIX=1 -DMOZ_X11=1 -fPIC -g -I ../npapi-sdk-headers -I$ /usr/share/R/include
R_LD_FLAGS=-L$(R_HOME)/lib -lR
-LD_FLAGS=-lpthread
+#LD_FLAGS=-lpthread
#OBJ_FILES = WebRPlugin.o WebREngine.o NPConversions.o WebRObject.o
OBJ_FILES = BasicPlugin.o WebREngine.o NPConversions.o WebRObject.o WebRFunction.o WebRMutex.o
npbasicplugin : $(OBJ_FILES)
View
@@ -44,7 +44,7 @@
#include "npfunctions.h"
#include <npruntime.h>
#include <stdio.h>
-#include "pthread.h"
+//#include "pthread.h"
#define CSTACK_DEFNS 1
@@ -93,11 +93,12 @@ NPError NPP_SetValue(NPP instance, NPNVariable variable, void *value);
}
extern NPNetscapeFuncs *myNPNFuncs;
extern FILE *logfile;
+/*
extern pthread_mutex_t rMutex;
extern pthread_mutex_t queueMutex;
extern pthread_attr_t rThreadAttrs;
extern pthread_cond_t queueAdvance;
-
+*/
class WebREngine : public NPObject
{
protected:

0 comments on commit 4459d18

Please sign in to comment.