[ros-diffs] [cfinck] 28406: Build fixes for Mac OS X, thanks to Alex

cfinck at svn.reactos.org cfinck at svn.reactos.org
Sat Aug 18 21:07:13 CEST 2007


Author: cfinck
Date: Sat Aug 18 23:07:13 2007
New Revision: 28406

URL: http://svn.reactos.org/svn/reactos?rev=28406&view=rev
Log:
Build fixes for Mac OS X, thanks to Alex

Modified:
    trunk/reactos/tools/cabman/cabinet.cxx
    trunk/reactos/tools/cdmake/cdmake.c
    trunk/reactos/tools/nci/ncitool.c
    trunk/reactos/tools/ssprintf.cpp
    trunk/reactos/tools/xml.cpp

Modified: trunk/reactos/tools/cabman/cabinet.cxx
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?rev=28406&r1=28405&r2=28406&view=diff
==============================================================================
--- trunk/reactos/tools/cabman/cabinet.cxx (original)
+++ trunk/reactos/tools/cabman/cabinet.cxx Sat Aug 18 23:07:13 2007
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__APPLE__)
 # include <sys/stat.h>
 #endif // __FreeBSD__
 #include "cabinet.h"

Modified: trunk/reactos/tools/cdmake/cdmake.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=28406&r1=28405&r2=28406&view=diff
==============================================================================
--- trunk/reactos/tools/cdmake/cdmake.c (original)
+++ trunk/reactos/tools/cdmake/cdmake.c Sat Aug 18 23:07:13 2007
@@ -38,7 +38,7 @@
 # include <io.h>
 # include <dos.h>
 #else
-# ifdef __FreeBSD__
+# if defined(__FreeBSD__) || defined(__APPLE__)
 #  include <sys/uio.h>
 # else
 #  include <sys/io.h>

Modified: trunk/reactos/tools/nci/ncitool.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=28406&r1=28405&r2=28406&view=diff
==============================================================================
--- trunk/reactos/tools/nci/ncitool.c (original)
+++ trunk/reactos/tools/nci/ncitool.c Sat Aug 18 23:07:13 2007
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__APPLE__)
 # include <malloc.h>
 #endif // __FreeBSD__
 

Modified: trunk/reactos/tools/ssprintf.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ssprintf.cpp?rev=28406&r1=28405&r2=28406&view=diff
==============================================================================
--- trunk/reactos/tools/ssprintf.cpp (original)
+++ trunk/reactos/tools/ssprintf.cpp Sat Aug 18 23:07:13 2007
@@ -14,7 +14,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__APPLE__)
 # include <stdlib.h>
 #else
 # include <malloc.h>
@@ -34,7 +34,7 @@
 }
 #endif//WIN32
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__APPLE__)
 # define __isnan isnan
 # define __finite finite
 # define powl __builtin_powl

Modified: trunk/reactos/tools/xml.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/xml.cpp?rev=28406&r1=28405&r2=28406&view=diff
==============================================================================
--- trunk/reactos/tools/xml.cpp (original)
+++ trunk/reactos/tools/xml.cpp Sat Aug 18 23:07:13 2007
@@ -99,7 +99,7 @@
 #ifdef WIN32
 	return _filelengthi64 ( _fileno(f) );
 #else
-# ifdef __FreeBSD__
+# if defined(__FreeBSD__) || defined(__APPLE__)
 	struct stat file_stat;
 	if ( fstat(fileno(f), &file_stat) != 0 )
 # else




More information about the Ros-diffs mailing list