INTEGRATION: CWS cmcfixes21 (1.11.48); FILE MERGED

2005/11/10 16:17:51 cmc 1.11.48.1: #i53612# np_sdk optional on MOZ
This commit is contained in:
Oliver Bolte 2005-12-21 10:13:48 +00:00
parent 4595d591f7
commit 48d7792919

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: nfuncs.cxx,v $ * $RCSfile: nfuncs.cxx,v $
* *
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 19:51:16 $ * last change: $Author: obo $ $Date: 2005-12-21 11:13:48 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -231,7 +231,7 @@ extern "C" {
return NULL; return NULL;
} }
void* SAL_CALL NP_LOADDS NPN_GetJavaPeer( NPP instance ) jref SAL_CALL NP_LOADDS NPN_GetJavaPeer( NPP instance )
{ {
TRACE( "NPN_GetJavaPeer" ); TRACE( "NPN_GetJavaPeer" );
return NULL; return NULL;