summaryrefslogtreecommitdiff
path: root/sal/osl/unx/process.c
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-06-12 08:46:49 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-06-12 08:46:49 +0000
commite08d0ebe3680f8576353fe636befaa90f44254a7 (patch)
tree357114a06304582605e9ed60192811aafa45af9b /sal/osl/unx/process.c
parentb856168f479c6a9b9aae9718661aa41c87c0b2e1 (diff)
INTEGRATION: CWS mh11rc (1.29.42); FILE MERGED
2003/06/06 09:53:09 mh 1.29.42.1: join: from beta2
Diffstat (limited to 'sal/osl/unx/process.c')
-rw-r--r--sal/osl/unx/process.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c
index d38ae0589b11..7611c7f910c2 100644
--- a/sal/osl/unx/process.c
+++ b/sal/osl/unx/process.c
@@ -2,9 +2,9 @@
*
* $RCSfile: process.c,v $
*
- * $Revision: 1.29 $
+ * $Revision: 1.30 $
*
- * last change: $Author: hr $ $Date: 2003-03-26 16:46:04 $
+ * last change: $Author: vg $ $Date: 2003-06-12 09:46:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -249,7 +249,7 @@ sal_Char *getCmdLine()
/* Memory layout of CMD_ARG_PRG:
progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */
-#if !defined(NETBSD)
+#if !defined(NETBSD) && !defined(FREEBSD)
extern sal_Char* CMD_ARG_PRG;
#endif
extern sal_Char** CMD_ARG_ENV;