diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:52 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:52 +0200 |
| commit | 7ea2f89d49f913909c178e1ff34394a88b3d7b54 (patch) | |
| tree | 5c4f62313b6b0f12c9a27b17ed04aae80c08a34a /np_sdk | |
| parent | 09034b762bdc19da62867e856cc515b132f381b3 (diff) | |
| parent | 714332d216d3da5360a0b7f07ab3512aa252038b (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
libwps/makefile.mk
Diffstat (limited to 'np_sdk')
| -rw-r--r-- | np_sdk/mozsrc/npapi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/np_sdk/mozsrc/npapi.h b/np_sdk/mozsrc/npapi.h index aa90fa25aaef..c89b70a95cfb 100644 --- a/np_sdk/mozsrc/npapi.h +++ b/np_sdk/mozsrc/npapi.h @@ -42,8 +42,9 @@ * Netscape client plug-in API spec */ -#ifndef _NPAPI_H_ +#if !defined(_NPAPI_H_) && !defined(npapi_h_) #define _NPAPI_H_ +#define npapi_h_ #include "jri.h" /* Java Runtime Interface */ |