[Libreoffice-commits] .: sal/osl

[François Tigeot]

 sal/osl/unx/system.h |   23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

New commits:
commit c7aa517c79f12b6bfe97f2b0a3e27bc6532a172a
Author: François Tigeot <ftigeot at wolfpond.org>
Date:   Tue Jan 31 20:28:54 2012 +0100

    Regroup DragonFly and NetBSD configurations

diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 881bc88..8df8620 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -120,28 +120,7 @@
 #endif
 
 #ifdef NETBSD
-#   include <sys/param.h>
-#       ifndef ETIME
-#     define  ETIME ETIMEDOUT
-#       endif
-#   include <pthread.h>
-#   include <netdb.h>
-#   include <sys/sem.h>
-#   include <sys/exec.h>
-#   include <sys/filio.h>
-#   include <sys/ioctl.h>
-#   include <sys/time.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <dlfcn.h>
-#   include <machine/endian.h>
-#   define  IORESOURCE_TRANSFER_BSD
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_PRIORITY
-#     define  NO_PTHREAD_SEMAPHORES
 #   define  NO_PTHREAD_RTL
-#   define  PTHREAD_SIGACTION           pthread_sigaction
 #endif
 
 #ifdef FREEBSD
@@ -199,7 +178,7 @@
 #       define  PTHREAD_SIGACTION                       pthread_sigaction
 #endif
 
-#ifdef DRAGONFLY
+#if defined(DRAGONFLY) || defined(NETBSD)
 #   define  ETIME ETIMEDOUT
 #   include <pthread.h>
 #   include <sys/sem.h>