summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-10-01 08:19:55 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-10-01 08:19:55 +0000
commit2c033bd486337d968dc57f48b31ed54e1afe248d (patch)
tree14b0a4fe2bd4696cb7529d203e1eaaef96c18ddb
parent17236a45c1368b8e9be8dae0f2b6918a88e7f4f4 (diff)
CWS-TOOLING: integrate CWS cloph11
-rw-r--r--vcl/unx/source/app/sm.cxx9
1 files changed, 1 insertions, 8 deletions
diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx
index 77fcc8632ed5..5bc307b0146f 100644
--- a/vcl/unx/source/app/sm.cxx
+++ b/vcl/unx/source/app/sm.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: sm.cxx,v $
- * $Revision: 1.33 $
+ * $Revision: 1.33.90.1 $
*
* This file is part of OpenOffice.org.
*
@@ -35,13 +35,6 @@
#include <sys/poll.h>
#include <fcntl.h>
-// [ed] 6/15/02 Use the poll replacement on OS X
-// [ericb] 5/7/05 mismatch in Mac OSX 10.4, test is necessary
-#if defined (MACOSX) && (BUILD_OS_MAJOR==10) && (BUILD_OS_MINOR<4)
-#include <poll.h>
-#else
-#include <sys/poll.h>
-#endif
#include <stdio.h>
#include <osl/process.h>