From 4d17c048058fa9f46f03f525e3ea4f4b1d228c9e Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Tue, 31 May 2005 16:09:26 +0000
Subject: INTEGRATION: CWS macosx07 (1.3.94); FILE MERGED 2005/05/06 00:09:02
 ericb 1.3.94.1: i39961 nsplugin buildable for Mac OSX

---
 extensions/source/nsplugin/source/so_env.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'extensions/source/nsplugin')

diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx
index 375e65535a8a..15eaf56fefb6 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: so_env.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: kz $ $Date: 2004-11-26 16:01:41 $
+ *  last change: $Author: kz $ $Date: 2005-05-31 17:09:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,10 +62,10 @@
 #ifdef UNIX
 #include <sys/types.h>
 #include <strings.h>
-#ifdef NP_LINUX
-#include <stdarg.h>
+#if defined(SOLARIS) && !defined(__GNUC__)
+#include <varargs.h>
 #else
-#include <sys/varargs.h>
+#include <stdarg.h>
 #endif
 // For vsnprintf()
 #define NSP_vsnprintf vsnprintf
-- 
cgit