INTEGRATION: CWS vcl49 (1.7.58); FILE MERGED
2005/12/14 15:44:28 pl 1.7.58.1: #i56878# use mozilla headers instead of npsdk, use OJI definition
This commit is contained in:
parent
0382308333
commit
7196510da6
1 changed files with 5 additions and 4 deletions
|
@ -4,9 +4,9 @@
|
|||
*
|
||||
* $RCSfile: plugcon.hxx,v $
|
||||
*
|
||||
* $Revision: 1.8 $
|
||||
* $Revision: 1.9 $
|
||||
*
|
||||
* last change: $Author: obo $ $Date: 2005-12-21 11:14:04 $
|
||||
* last change: $Author: obo $ $Date: 2006-01-20 12:58:34 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -73,6 +73,7 @@
|
|||
#endif
|
||||
#include <X11/Xatom.h>
|
||||
#define XP_UNIX
|
||||
#define MOZ_X11
|
||||
#include <stdio.h>
|
||||
#ifdef SYSTEM_MOZILLA
|
||||
#define OJI
|
||||
|
@ -81,8 +82,8 @@
|
|||
#include <npapi.h>
|
||||
#else
|
||||
#ifndef _NPAPI_H_
|
||||
#include <npsdk/npupp.h>
|
||||
#include <npsdk/npapi.h>
|
||||
#include <npupp.h>
|
||||
#include <npapi.h>
|
||||
#endif
|
||||
#endif
|
||||
#undef Window
|
||||
|
|
Loading…
Reference in a new issue