[Libreoffice-commits] .: Branch 'libreoffice-3-4' - extensions/source

[Petr Mladek]

 extensions/source/plugin/inc/plugin/unx/plugcon.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1cf9f61195fdec798e8f696fc3356f4473eb4750
Author: Jan Nieuwenhuizen <janneke at gnu.org>
Date:   Thu Apr 28 18:12:31 2011 +0200

    build-fix-xulrunner-npapi-inc.diff: build with xulrunner-1.9.1

diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 1242608..dc82c9f 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -98,7 +98,7 @@ extern "C" {
 #  endif
 #endif
 
-#ifndef _NPAPI_H_
+#if ! defined ( _NPAPI_H_) && ! defined (npapi_h_)
 extern "C" {
 #include <npsdk/npupp.h>
 }