[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    icecream
From:       Fathi Boudra <fabo () kde ! org>
Date:       2010-04-22 6:46:24
Message-ID: 20100422064624.E96C8AC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1117433 by fabo:

Fix kFreeBSD build

 M  +2 -2      daemon/ncpus.c  
 M  +1 -1      minilzo/lzodefs.h  
 M  +1 -1      minilzo/minilzo.c  


--- trunk/icecream/daemon/ncpus.c #1117432:1117433
@@ -89,7 +89,7 @@
      return 0;
 }
 
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
defined(__APPLE__) || defined(__bsdi__) || defined(__DragonFly__) +#elif \
defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || \
defined(__NetBSD__) || defined(__APPLE__) || defined(__bsdi__) || \
defined(__DragonFly__)  
 /* http://www.FreeBSD.org/cgi/man.cgi?query=sysctl&sektion=3&manpath=FreeBSD+4.6-stable
  http://www.openbsd.org/cgi-bin/man.cgi?query=sysctl&sektion=3&manpath=OpenBSD+Current
 @@ -100,7 +100,7 @@
 #include <sys/param.h>
 #include <sys/sysctl.h>
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #undef HAVE_RS_LOG_ERROR
 #else
 #define HAVE_RS_LOG_ERROR
--- trunk/icecream/minilzo/lzodefs.h #1117432:1117433
@@ -356,7 +356,7 @@
 #  if defined(_AIX) || defined(__AIX__) || defined(__aix__)
 #    define LZO_OS_POSIX_AIX        1
 #    define LZO_INFO_OS_POSIX       "aix"
-#  elif defined(__FreeBSD__)
+#  elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #    define LZO_OS_POSIX_FREEBSD    1
 #    define LZO_INFO_OS_POSIX       "freebsd"
 #  elif defined(__hpux__) || defined(__hpux)
--- trunk/icecream/minilzo/minilzo.c #1117432:1117433
@@ -377,7 +377,7 @@
 #  if defined(_AIX) || defined(__AIX__) || defined(__aix__)
 #    define LZO_OS_POSIX_AIX        1
 #    define LZO_INFO_OS_POSIX       "aix"
-#  elif defined(__FreeBSD__)
+#  elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #    define LZO_OS_POSIX_FREEBSD    1
 #    define LZO_INFO_OS_POSIX       "freebsd"
 #  elif defined(__hpux__) || defined(__hpux)


[prev in list] [next in list] [prev in thread] [next in thread]