1 --- FreeWRL-1.00/Plugin/mozilla/Makefile.orig 2003-08-10 14:41:33.000000000 +0200
2 +++ FreeWRL-1.00/Plugin/mozilla/Makefile 2003-08-11 20:36:01.638817672 +0200
7 -MOZILLA_INST:=/usr/lib/mozilla-1.0.0
8 +MOZILLA_INST:=/usr/lib/mozilla
14 -MOZILLA_INC:=/usr/include/mozilla-1.0.0
15 +MOZILLA_INC:=/usr/include/mozilla
23 + -I/usr/include/nspr\
24 -I${PLUGIN_GLUE_DIR}/CFuncs\
25 -I${MOZILLA_INC}/plugin\
26 -I${MOZILLA_INC}/xpcom\
32 - -I/usr/include/gtk-1.2\
33 - -I/usr/include/glib-1.2\
34 - -I/usr/lib/glib/include\
35 - -include include/config-rhlinux72-i686.h ## for platform defines
36 + `$(GTK_CONFIG) --cflags` \
37 + -include /usr/include/mozilla/mozilla-config.h ## for platform defines
60 + `$(GTK_CONFIG) --libs`
64 --- FreeWRL-1.00/Plugin/mozilla/source/npFreeWRLInstance.cpp.orig 2003-08-10 14:41:33.000000000 +0200
65 +++ FreeWRL-1.00/Plugin/mozilla/source/npFreeWRLInstance.cpp 2003-08-11 20:33:17.972698704 +0200
67 // add MacOS code later
70 - if (signal(SIGIO, (__sighandler_t) &npFreeWRLInstance::signalHandler) == SIG_ERR) {
71 + if (signal(SIGIO, (__sighandler_t) &npFreeWRLInstance_signalHandler) == SIG_ERR) {
72 std::cerr << "signal with SIGIO failed." << endl;
76 - if (signal(SIGPIPE, (__sighandler_t) &npFreeWRLInstance::signalHandler) == SIG_ERR) {
77 + if (signal(SIGPIPE, (__sighandler_t) &npFreeWRLInstance_signalHandler) == SIG_ERR) {
78 std::cerr << "signal with SIGPIPE failed." << endl;
83 - if (signal(SIGBUS, (__sighandler_t) &npFreeWRLInstance::signalHandler) == SIG_ERR) {
84 + if (signal(SIGBUS, (__sighandler_t) &npFreeWRLInstance_signalHandler) == SIG_ERR) {
85 std::cerr << "signal with SIGPIPE failed." << endl;
90 - if (signal(SIGHUP, (__sighandler_t) &npFreeWRLInstance::signalHandler) == SIG_ERR) {
91 + if (signal(SIGHUP, (__sighandler_t) &npFreeWRLInstance_signalHandler) == SIG_ERR) {
92 std::cerr << "signal with SIGHUP failed." << endl;
96 - if (signal(SIGUSR2, (__sighandler_t) &npFreeWRLInstance::signalHandler) == SIG_ERR) {
97 + if (signal(SIGUSR2, (__sighandler_t) &npFreeWRLInstance_signalHandler) == SIG_ERR) {
98 std::cerr << "signal with SIGUSR2 failed." << endl;
105 -npFreeWRLInstance::signalHandler(int signo)
106 +npFreeWRLInstance_signalHandler(int signo)
109 std::cerr << "npFreeWRLInstance signalHandler signal number = "
112 std::cerr << "\tplugin caught SIGIO!" << endl;
114 - if (receiveUrl(socketDesc, &lastRequest) != NPERR_NO_ERROR) {
115 +/* if (receiveUrl(socketDesc, &lastRequest) != NPERR_NO_ERROR) {
116 std::cerr << "receiveUrl returned with error!" << endl;
118 if (NPN_GetURL((NPP) lastRequest.instance,
121 fprintf(stderr, "NPN_GetURL failed.\n");
124 + } -- socketDesc and lastRequest inaccessible here */
128 --- FreeWRL-1.00/Plugin/mozilla/include/npFreeWRLInstance.h.orig 2003-07-24 15:59:15.000000000 +0200
129 +++ FreeWRL-1.00/Plugin/mozilla/include/npFreeWRLInstance.h 2003-08-10 16:12:44.000000000 +0200
132 // from mozilla plugin sdk and samples - plugin.h
134 +void npFreeWRLInstance_signalHandler(int signo);
135 class npFreeWRLInstance : public npInstanceBase
139 void getVersion(char **aVersion);
142 - void signalHandler(int signo);
143 PlatformInfo * getPlatformInfo();