[Gnash-commit] [SCM] Gnash branch, master, updated. 0dfaad0a0dfb53c3ce12d3f32a130ae7599a758e

[Andrea Palmatè]

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  0dfaad0a0dfb53c3ce12d3f32a130ae7599a758e (commit)
      from  64b7d98ff7364285828cd9e50c564ada9931d7d9 (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=0dfaad0a0dfb53c3ce12d3f32a130ae7599a758e


commit 0dfaad0a0dfb53c3ce12d3f32a130ae7599a758e
Author: Andrea Palmatè <address@hidden>
Date:   Sun Sep 19 20:03:20 2010 +0200

    Some small changes to allow AmigaOS4 compilation again

diff --git a/libbase/RTMP.cpp b/libbase/RTMP.cpp
index 4468b34..b39d27b 100644
--- a/libbase/RTMP.cpp
+++ b/libbase/RTMP.cpp
@@ -1264,9 +1264,12 @@ encodeInt32(boost::uint8_t *output, boost::uint8_t 
*outend, int nVal)
 boost::uint32_t
 getUptime()
 {
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__amigaos4__)
     struct tms t;
     return times(&t) * 1000 / sysconf(_SC_CLK_TCK);
+#elif defined(__amigaos4__)
+    struct tms t;
+    return times(&t) * 1000 / 50;
 #else
     return std::clock() * 100 / CLOCKS_PER_SEC;   
 #endif
diff --git a/libbase/SharedMem.cpp b/libbase/SharedMem.cpp
index a6109c1..50fcb43 100644
--- a/libbase/SharedMem.cpp
+++ b/libbase/SharedMem.cpp
@@ -150,12 +150,14 @@ SharedMem::attach()
 
     // First get semaphore.
     
+#ifndef __amigaos4__
     // Struct for semctl
     union semun {
         int val;
         struct semi_ds* buf;
         unsigned short* array;
     };
+#endif
 
     // Check if it exists already.
     _semid = semget(_shmkey, 1, 0600);
diff --git a/libbase/Socket.cpp b/libbase/Socket.cpp
index 38e6fd7..4dd6e06 100644
--- a/libbase/Socket.cpp
+++ b/libbase/Socket.cpp
@@ -33,6 +33,7 @@ namespace {
 #include "URL.h"
 #include "Socket.h"
 #include "log.h"
+#include "utility.h"
 #include "GnashAlgorithm.h"
 
 namespace gnash {
diff --git a/libbase/utility.h b/libbase/utility.h
index 12c6c4f..f2e1d3d 100644
--- a/libbase/utility.h
+++ b/libbase/utility.h
@@ -52,6 +52,10 @@
 #endif // _WIN32
 
 #ifdef __amigaos4__
+#include <stdio.h> //for FILE * in tu_file.h
+#include <fcntl.h> //for fcntl in Socket.cpp
+#include <netdb.h> //for hostent in Socket.cpp
+#include <netinet/tcp.h> //for TCP_NODELAY in Socket.cpp
 #undef UNUSED //to avoid "already defined" messages
 #define SHUT_RDWR 0
 

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

Summary of changes:
 libbase/RTMP.cpp      |    5 ++++-
 libbase/SharedMem.cpp |    2 ++
 libbase/Socket.cpp    |    1 +
 libbase/utility.h     |    4 ++++
 4 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash