diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 12:24:24 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 12:24:24 +0000 |
| commit | 0c4790bae7b0290b0e5a80d5f0c2a696832b7b61 (patch) | |
| tree | d77ddcaf5318199c34940bada89938b1b55c27d4 /sal/osl/unx/util.c | |
| parent | ea724858cbf1b1a3c2bfb4054e5ff7f5782b0bc5 (diff) | |
INTEGRATION: CWS sal05 (1.5.36); FILE MERGED
2003/11/03 14:27:48 tra 1.5.36.1: #112918#remove most warnings reported by the solaris compiler when compiling with -wall
Diffstat (limited to 'sal/osl/unx/util.c')
| -rw-r--r-- | sal/osl/unx/util.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c index ab7aa6354873..7b684bbb7988 100644 --- a/sal/osl/unx/util.c +++ b/sal/osl/unx/util.c @@ -2,9 +2,9 @@ * * $RCSfile: util.c,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2003-07-02 13:35:19 $ + * last change: $Author: hr $ $Date: 2004-02-03 13:24:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,7 +101,7 @@ sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr ) #ifdef SOLARIS /** algorithm doesn't work on solaris */ return sal_False; -#endif +#else if ( pAddr == 0 ) { @@ -151,6 +151,7 @@ sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr ) } return sal_False; +#endif } |