summaryrefslogtreecommitdiff
path: root/desktop/source
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-02-04 11:52:24 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-02-04 11:52:24 +0000
commit0c1ac7e3f3f276ecfac6f997df860969d3a055dd (patch)
tree61df916f312f2e927c7f56a3de761047544c73bc /desktop/source
parent4f7bb3779c6800be21a249b1790667e831b091bf (diff)
INTEGRATION: CWS ooo20031216 (1.3.90); FILE MERGED
2003/12/13 13:06:28 waratah 1.3.90.1: #i1858# bracket USE_BSD define with #ifndef to remove a waring
Diffstat (limited to 'desktop/source')
-rw-r--r--desktop/source/pagein/file_image_unx.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/desktop/source/pagein/file_image_unx.c b/desktop/source/pagein/file_image_unx.c
index 69f33b6447be..f63021170c49 100644
--- a/desktop/source/pagein/file_image_unx.c
+++ b/desktop/source/pagein/file_image_unx.c
@@ -2,9 +2,9 @@
*
* $RCSfile: file_image_unx.c,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: hr $ $Date: 2003-07-16 17:41:32 $
+ * last change: $Author: hr $ $Date: 2004-02-04 12:52:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -67,7 +67,9 @@
#include <fcntl.h>
#if defined(LINUX)
-#define __USE_BSD /* madvise, MADV_WILLNEED */
+# ifndef __USE_BSD
+# define __USE_BSD /* madvise, MADV_WILLNEED */
+# endif
#endif /* Linux */
#include <sys/mman.h>