[Gnash-commit] /srv/bzr/gnash/trunk r10627: patch from Paul Smedley so OS2 builds.

[rob]

------------------------------------------------------------
revno: 10627
committer: address@hidden
branch nick: trunk
timestamp: Wed 2009-02-25 14:09:09 -0700
message:
  patch from Paul Smedley so OS2 builds.
modified:
  libbase/curl_adapter.cpp
  libbase/getclocktime.hpp
  libbase/rc.cpp

=== modified file 'libbase/curl_adapter.cpp'
--- a/libbase/curl_adapter.cpp  2009-02-23 18:04:44 +0000
+++ b/libbase/curl_adapter.cpp  2009-02-25 21:09:09 +0000
@@ -671,6 +671,7 @@
                // Wait for data on the filedescriptors until a timeout set
                // in gnashrc.
                int ret = select(maxfd + 1, &readfd, &writefd, &exceptfd, &tv);
+#ifndef __OS2__ // select will always fail here as we can't select on file 
descriptors, only on sockets
                if ( ret == -1 )
                {
             if ( errno == EINTR )
@@ -691,6 +692,7 @@
                 throw GnashException(fmt.str());
             }
                }
+#endif
                if ( ! ret )
                {
                        // timeout

=== modified file 'libbase/getclocktime.hpp'
--- a/libbase/getclocktime.hpp  2009-02-25 20:25:28 +0000
+++ b/libbase/getclocktime.hpp  2009-02-25 21:09:09 +0000
@@ -25,6 +25,7 @@
 
 #include <ctime>
 
+#ifndef __OS2__
 #ifndef HAVE_CLOCK_GETTIME
 
 #include <sys/time.h>
@@ -52,4 +53,5 @@
 }
 
 #endif
+#endif /* __OS2__ */
 #endif /* GETCLOCKTIMER_HPP */

=== modified file 'libbase/rc.cpp'
--- a/libbase/rc.cpp    2009-02-25 02:00:44 +0000
+++ b/libbase/rc.cpp    2009-02-25 21:09:09 +0000
@@ -136,8 +136,10 @@
 
     // Check the default system location
     std::string loadfile = SYSCONFDIR;
+#ifndef __OS2__ // On OS/2 - only look in %HOME%
     loadfile.append("/gnashrc");
     parseFile(loadfile);
+#endif
     
     // Check the users home directory
     char *home = std::getenv("HOME");