[Gnash-commit] /srv/bzr/gnash/trunk r12174: add support for Android when determining which headers to include.

[Rob Savoye]

------------------------------------------------------------
revno: 12174
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sun 2010-05-02 22:18:39 -0600
message:
  add support for Android when determining which headers to include.
modified:
  libbase/SharedMemHaiku.cpp
  libbase/rc.h

=== modified file 'libbase/SharedMemHaiku.cpp'
--- a/libbase/SharedMemHaiku.cpp        2010-02-17 17:57:51 +0000
+++ b/libbase/SharedMemHaiku.cpp        2010-05-03 04:18:39 +0000
@@ -22,10 +22,11 @@
 #endif
 
 #include <sys/types.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__) && 
!defined(__HAIKU__)
+#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__) && 
!defined(__HAIKU__) && !defined(_ANDROID)
 # include <sys/ipc.h>
 # include <sys/shm.h>
-#elif !defined(__riscos__) && !defined(__OS2__) && !defined(__HAIKU__)
+#elif !defined(__riscos__) && !defined(__OS2__) && !defined(__HAIKU__) && 
!defined(_ANDROID)
+
 # include <windows.h>
 # include <process.h>
 # include <fcntl.h>

=== modified file 'libbase/rc.h'
--- a/libbase/rc.h      2010-03-31 08:20:52 +0000
+++ b/libbase/rc.h      2010-05-03 04:18:39 +0000
@@ -29,7 +29,7 @@
 #include <boost/cstdint.hpp>
 #include <boost/tokenizer.hpp>
 
-#if !defined(_WIN32) && !defined(__HAIKU__)
+#if !defined(_WIN32) && !defined(__HAIKU__) && !defined(_ANDROID)
 #include <sys/shm.h>
 #else
 #ifdef _WIN32