diff --git a/mozilla/modules/plugin/default/unix/npshell.c b/mozilla/modules/plugin/default/unix/npshell.c index 58f3ce69f3a..2020cdeeabe 100644 --- a/mozilla/modules/plugin/default/unix/npshell.c +++ b/mozilla/modules/plugin/default/unix/npshell.c @@ -44,11 +44,6 @@ #include "npapi.h" #include "nullplugin.h" #include "strings.h" -#include "nslog.h" - -NS_IMPL_LOG(npshellLog) -#define PRINTF NS_LOG_PRINTF(npshellLog) -#define FLUSH NS_LOG_FLUSH(npshellLog) /*********************************************************************** * @@ -206,10 +201,10 @@ NPP_SetWindow(NPP instance, NPWindow* window) id. */ #ifdef DEBUG - PRINTF("Nullplugin: plugin received window resize.\n"); - PRINTF("Window=(%i)\n", (int)window); + printf("Nullplugin: plugin received window resize.\n"); + printf("Window=(%i)\n", (int)window); if (window) { - PRINTF("W=(%i) H=(%i)\n", + printf("W=(%i) H=(%i)\n", (int)window->width, (int)window->height); } #endif diff --git a/mozilla/modules/plugin/default/unix/npunix.c b/mozilla/modules/plugin/default/unix/npunix.c index 7418260c093..1a3de3c3dda 100644 --- a/mozilla/modules/plugin/default/unix/npunix.c +++ b/mozilla/modules/plugin/default/unix/npunix.c @@ -40,11 +40,6 @@ #include #include "npapi.h" #include "npupp.h" -#include "nslog.h" - -NS_IMPL_LOG(npunixLog) -#define PRINTF NS_LOG_PRINTF(npunixLog) -#define FLUSH NS_LOG_FLUSH(npunixLog) /* * Define PLUGIN_TRACE to have the wrapper functions print @@ -53,7 +48,7 @@ NS_IMPL_LOG(npunixLog) #ifdef PLUGIN_TRACE #include -#define PLUGINDEBUGSTR(msg) PRINTF("%s\n", msg) +#define PLUGINDEBUGSTR(msg) printf("%s\n", msg) #else #define PLUGINDEBUGSTR(msg) #endif diff --git a/mozilla/modules/plugin/samples/default/unix/npshell.c b/mozilla/modules/plugin/samples/default/unix/npshell.c index 58f3ce69f3a..2020cdeeabe 100644 --- a/mozilla/modules/plugin/samples/default/unix/npshell.c +++ b/mozilla/modules/plugin/samples/default/unix/npshell.c @@ -44,11 +44,6 @@ #include "npapi.h" #include "nullplugin.h" #include "strings.h" -#include "nslog.h" - -NS_IMPL_LOG(npshellLog) -#define PRINTF NS_LOG_PRINTF(npshellLog) -#define FLUSH NS_LOG_FLUSH(npshellLog) /*********************************************************************** * @@ -206,10 +201,10 @@ NPP_SetWindow(NPP instance, NPWindow* window) id. */ #ifdef DEBUG - PRINTF("Nullplugin: plugin received window resize.\n"); - PRINTF("Window=(%i)\n", (int)window); + printf("Nullplugin: plugin received window resize.\n"); + printf("Window=(%i)\n", (int)window); if (window) { - PRINTF("W=(%i) H=(%i)\n", + printf("W=(%i) H=(%i)\n", (int)window->width, (int)window->height); } #endif diff --git a/mozilla/modules/plugin/samples/default/unix/npunix.c b/mozilla/modules/plugin/samples/default/unix/npunix.c index 7418260c093..1a3de3c3dda 100644 --- a/mozilla/modules/plugin/samples/default/unix/npunix.c +++ b/mozilla/modules/plugin/samples/default/unix/npunix.c @@ -40,11 +40,6 @@ #include #include "npapi.h" #include "npupp.h" -#include "nslog.h" - -NS_IMPL_LOG(npunixLog) -#define PRINTF NS_LOG_PRINTF(npunixLog) -#define FLUSH NS_LOG_FLUSH(npunixLog) /* * Define PLUGIN_TRACE to have the wrapper functions print @@ -53,7 +48,7 @@ NS_IMPL_LOG(npunixLog) #ifdef PLUGIN_TRACE #include -#define PLUGINDEBUGSTR(msg) PRINTF("%s\n", msg) +#define PLUGINDEBUGSTR(msg) printf("%s\n", msg) #else #define PLUGINDEBUGSTR(msg) #endif