Changeset 5961 in vbox

Timestamp:

Dec 5, 2007 7:43:44 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

26531

Message:

RT_OS_*, RT_ARCH_*

Location:

trunk/src

Files:

• VBox/Main/testcase/makefile.tstVBoxAPILinux (modified) (1 diff)
• libs/ffmpeg-20060710/config.h (modified) (4 diffs)

trunk/src/VBox/Main/testcase/makefile.tstVBoxAPILinux

@@ -33 +33 @@
 
 tstVBoxAPILinux.o: tstVBoxAPILinux.cpp
-        g++ -c -DRT_OS_LINUX -D__LINUX__ -g -fshort-wchar $(addprefix -I, $(INCS_XPCOM)) -o $@ tstVBoxAPILinux.cpp
+        g++ -c -DRT_OS_LINUX -g -fshort-wchar $(addprefix -I, $(INCS_XPCOM)) -o $@ tstVBoxAPILinux.cpp
 
 clean:

trunk/src/libs/ffmpeg-20060710/config.h

@@ -3 +3 @@
 /* Modified, despite above warnings. */
 
-#if defined(CONFIG_WIN32) || defined(__DARWIN__)
+#if defined(CONFIG_WIN32) || defined(RT_OS_DARWIN)
 # define FFMPEG_CONFIGURATION " --enable-memalign-hack "
 #else
 # define FFMPEG_CONFIGURATION " "
 #endif
-#ifdef __AMD64__
+#ifdef RT_ARCH_AMD64
 # define ARCH_X86_64 1
 #else
@@ -17 +17 @@
 #define __CPU__ 586
 #define HAVE_BUILTIN_VECTOR 1
-#ifdef __AMD64__
+#ifdef RT_ARCH_AMD64
 # define HAVE_MM3DNOW 1
 #endif 
@@ -39 +39 @@
 # endif
 #else
-# ifdef __LINUX__
+# ifdef RT_OS_LINUX
 #  define CONFIG_VIDEO4LINUX 1
 #  define CONFIG_VIDEO4LINUX2 1
@@ -51 +51 @@
 # define CONFIG_ZLIB 1
 #endif
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
 # undef HAVE_MALLOC_H
 #else
 # define HAVE_MALLOC_H 1
 #endif 
-#if defined(CONFIG_WIN32) || defined(__DARWIN__)
+#if defined(CONFIG_WIN32) || defined(RT_OS_DARWIN)
 # undef HAVE_MEMALIGN
 # define MEMALIGN_HACK 1