diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-30 13:12:13 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-30 13:12:13 +0200 |
| commit | 94a0ea6b9eeaef219114091da479063227243ebd (patch) | |
| tree | ecc540dd0c421dcca50c7ba1fd811e8f6e5415bb /extensions | |
| parent | f8205aeecb38200b3179d01e4021dbe41e466b6c (diff) | |
| parent | 90a2bfb5176f8f54b55ff4759b076d93bdc11384 (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index d13068576663..b98ba85260d9 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -94,7 +94,7 @@ extern "C" { # endif #endif -#ifndef _NPAPI_H_ +#if ! defined ( _NPAPI_H_) && ! defined (npapi_h_) extern "C" { #include <npsdk/npupp.h> } |