[Gnash-commit] [SCM] Gnash branch, master, updated. 3a1604e5ab586b0c10a1020ed1db72e1cd232f11

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  3a1604e5ab586b0c10a1020ed1db72e1cd232f11 (commit)
       via  0c0ea2de0a84994fa6c811c7c23baf68887083f6 (commit)
       via  a69ccc74b7a9ad721be4d891a57f48e059284c61 (commit)
       via  cae4a5efa44afb6e0b8f714cabc82ac06bc8ca20 (commit)
      from  829b1fbdb6a53e02a8594c0183682f6768a74126 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=3a1604e5ab586b0c10a1020ed1db72e1cd232f11


commit 3a1604e5ab586b0c10a1020ed1db72e1cd232f11
Merge: 0c0ea2d 829b1fb
Author: Rob Savoye <address@hidden>
Date:   Mon Aug 30 12:44:01 2010 -0600

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=0c0ea2de0a84994fa6c811c7c23baf68887083f6


commit 0c0ea2de0a84994fa6c811c7c23baf68887083f6
Author: Rob Savoye <address@hidden>
Date:   Mon Aug 30 12:30:23 2010 -0600

    Change from _ANDROID to ANDROID

diff --git a/libbase/SharedMem.cpp b/libbase/SharedMem.cpp
index 4c48f11..a6109c1 100644
--- a/libbase/SharedMem.cpp
+++ b/libbase/SharedMem.cpp
@@ -21,11 +21,11 @@
 #endif
 
 #include <sys/types.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__) && 
!defined(HAIKU_HOST) && !defined(_ANDROID)
+#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__) && 
!defined(HAIKU_HOST) && !defined(ANDROID)
 # include <sys/shm.h>
 # include <sys/sem.h>
 # include <sys/ipc.h>
-#elif !defined(__riscos__) && !defined(__OS2__) && !defined(_ANDROID)
+#elif !defined(__riscos__) && !defined(__OS2__) && !defined(ANDROID)
 # include <windows.h>
 # include <process.h>
 # include <io.h>
@@ -34,7 +34,7 @@
 #include <vector>
 #include <cerrno>
 
-#ifdef _ANDROID
+#ifdef ANDROID
 # include <linux/shm.h>
 # include <linux/sem.h>
 extern int shmctl (int __shmid, int __cmd, struct shmid_ds *__buf);
@@ -49,7 +49,7 @@ extern int semctl (int __semid, int __semnum, int __cmd, ...);
 #include "log.h"
 #include "SharedMem.h"
 
-#if (defined(USE_SYSV_SHM) && defined(HAVE_SHMGET)) || defined(_WIN32) || 
defined(_ANDROID)
+#if (defined(USE_SYSV_SHM) && defined(HAVE_SHMGET)) || defined(_WIN32) || 
defined(ANDROID)
 # define ENABLE_SHARED_MEM 1
 #else
 # undef ENABLE_SHARED_MEM
diff --git a/libbase/SharedMem.h b/libbase/SharedMem.h
index f74d63e..6218c83 100644
--- a/libbase/SharedMem.h
+++ b/libbase/SharedMem.h
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__) && 
!defined(__HAIKU__)
 # include <sys/ipc.h>
-#ifdef _ANDROID
+#ifdef ANDROID
 # include <linux/shm.h>
 #else
 # include <sys/shm.h>
diff --git a/libbase/SharedMemHaiku.cpp b/libbase/SharedMemHaiku.cpp
index 69ba428..fa1d6fa 100644
--- a/libbase/SharedMemHaiku.cpp
+++ b/libbase/SharedMemHaiku.cpp
@@ -22,10 +22,10 @@
 #endif
 
 #include <sys/types.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__) && 
!defined(__HAIKU__) && !defined(_ANDROID)
+#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__) && 
!defined(_ANDROID)
+#elif !defined(__riscos__) && !defined(__OS2__) && !defined(__HAIKU__) && 
!defined(ANDROID)
 
 # include <windows.h>
 # include <process.h>
diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index ab68c45..ccb61ed 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@ -22,7 +22,7 @@
 #include "gnashconfig.h"
 #endif
 
-#ifdef _ANDROID
+#ifdef ANDROID
 #include <sys/select.h>
 #endif
 
diff --git a/libbase/rc.h b/libbase/rc.h
index 4579ff5..199a11b 100644
--- a/libbase/rc.h
+++ b/libbase/rc.h
@@ -30,7 +30,7 @@
 #include <boost/cstdint.hpp>
 #include <boost/tokenizer.hpp>
 
-#if !defined(_WIN32) && !defined(__HAIKU__) && !defined(_ANDROID)
+#if !defined(_WIN32) && !defined(__HAIKU__) && !defined(ANDROID)
 #include <sys/shm.h>
 #else
 #ifdef _WIN32
diff --git a/libcore/vm/ASHandlers.cpp b/libcore/vm/ASHandlers.cpp
index bf974b7..8d1917c 100644
--- a/libcore/vm/ASHandlers.cpp
+++ b/libcore/vm/ASHandlers.cpp
@@ -3951,7 +3951,7 @@ guessEncoding(const std::string &str, int &length, 
std::vector<int>& offsets)
     }
 
     // It's something else.
-#ifdef _ANDROID
+#ifdef ANDROID
     length = str.size();
 #else
     length = std::mbstowcs(NULL, str.c_str(), 0);

http://git.savannah.gnu.org/cgit//commit/?id=a69ccc74b7a9ad721be4d891a57f48e059284c61


commit a69ccc74b7a9ad721be4d891a57f48e059284c61
Author: Rob Savoye <address@hidden>
Date:   Mon Aug 30 12:27:55 2010 -0600

    Don't use :: before C library functions.

diff --git a/libcore/ExternalInterface.cpp b/libcore/ExternalInterface.cpp
index 25c4047..51b333e 100644
--- a/libcore/ExternalInterface.cpp
+++ b/libcore/ExternalInterface.cpp
@@ -361,7 +361,7 @@ ExternalInterface::ExternalEventCheck(int fd)
         // some memory to read the data.
         // terminate incase we want to treat the data like a string.
         buffer[bytes+1] = 0;
-        int ret = ::read(fd, buffer.get(), bytes);
+        int ret = read(fd, buffer.get(), bytes);
         if (ret) {
             return parseInvoke(buffer.get());
         }
@@ -651,7 +651,7 @@ size_t
 ExternalInterface::writeBrowser(int fd, const std::string &data)
 {
     if (fd > 0) {
-        return ::write(fd, data.c_str(), data.size());
+        return write(fd, data.c_str(), data.size());
     }
 
     return -1;
@@ -688,7 +688,7 @@ ExternalInterface::readBrowser(int fd)
 
     std::string buf(bytes, '\0');
 
-    int ret = ::read(fd, &buf[0], bytes);
+    int ret = read(fd, &buf[0], bytes);
     if (ret <= 0) {
         return empty;
     }

http://git.savannah.gnu.org/cgit//commit/?id=cae4a5efa44afb6e0b8f714cabc82ac06bc8ca20


commit cae4a5efa44afb6e0b8f714cabc82ac06bc8ca20
Author: Rob Savoye <address@hidden>
Date:   Mon Aug 30 12:27:27 2010 -0600

    Don't try to test for ATARI or VIRTUAL bus events.

diff --git a/gui/EventDevice.cpp b/gui/EventDevice.cpp
index abfe302..414616f 100644
--- a/gui/EventDevice.cpp
+++ b/gui/EventDevice.cpp
@@ -132,9 +132,11 @@ EventDevice::init(const std::string &filespec, size_t /* 
size */)
       case BUS_BLUETOOTH:
           log_unimpl("is Bluetooth bus type ");
           break;
+#ifdef BUS_VIRTUAL
       case BUS_VIRTUAL:
           log_unimpl("is a Virtual bus type ");
           break;
+#endif
       case BUS_ISA:
           log_unimpl("is an ISA bus type");
           break;
@@ -177,9 +179,11 @@ EventDevice::init(const std::string &filespec, size_t /* 
size */)
       case BUS_GSC:
           log_unimpl("is a GSC bus type");
           break;
+#ifdef BUS_ATARI
       case BUS_ATARI:
           log_unimpl("is an Atari bus type");
           break;
+#endif
       default:
           log_error("Unknown bus type %d!", _device_info.bustype);
     }

-----------------------------------------------------------------------

Summary of changes:
 gui/EventDevice.cpp           |    4 ++++
 libbase/SharedMem.cpp         |    8 ++++----
 libbase/SharedMem.h           |    2 +-
 libbase/SharedMemHaiku.cpp    |    4 ++--
 libbase/curl_adapter.cpp      |    2 +-
 libbase/rc.h                  |    2 +-
 libcore/ExternalInterface.cpp |    6 +++---
 libcore/vm/ASHandlers.cpp     |    2 +-
 8 files changed, 17 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Gnash