[Gnash-commit] /srv/bzr/gnash/trunk r10630: Remove comments from the end of preprocessor directives, as some compilers

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10630
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2009-02-26 09:04:27 +0100
message:
  Remove comments from the end of preprocessor directives, as some compilers
  choke on them.
  
  Add missing return.
  
  Break some long lines.
modified:
  libamf/element.cpp
  libbase/curl_adapter.cpp
  libbase/getclocktime.hpp
  libbase/rc.cpp
  libcore/as_environment.cpp

=== modified file 'libamf/element.cpp'
--- a/libamf/element.cpp        2009-02-25 22:33:03 +0000
+++ b/libamf/element.cpp        2009-02-26 08:04:27 +0000
@@ -1086,6 +1086,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
     _type = Element::REFERENCE_AMF0;
+    return *this;
 }
 
 Element &

=== modified file 'libbase/curl_adapter.cpp'
--- a/libbase/curl_adapter.cpp  2009-02-25 22:33:03 +0000
+++ b/libbase/curl_adapter.cpp  2009-02-26 08:04:27 +0000
@@ -671,7 +671,10 @@
                // 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
+
+// select() will always fail on OS/2 as we can't select
+// on file descriptors, only on sockets
+#ifndef __OS2__ 
                if ( ret == -1 )
                {
             if ( errno == EINTR )

=== modified file 'libbase/getclocktime.hpp'
--- a/libbase/getclocktime.hpp  2009-02-25 22:33:03 +0000
+++ b/libbase/getclocktime.hpp  2009-02-26 08:04:27 +0000
@@ -25,8 +25,8 @@
 
 #include <ctime>
 
-#ifndef __OS2__
-#ifndef HAVE_CLOCK_GETTIME
+// TODO: why doesn't OS2 define HAVE_CLOCK_GETTIME?
+#if !defined(HAVE_CLOCK_GETTIME) && !defined(__OS2__)
 
 #include <sys/time.h>
 
@@ -53,5 +53,4 @@
 }
 
 #endif
-#endif /* __OS2__ */
-#endif /* GETCLOCKTIMER_HPP */
+#endif 

=== modified file 'libbase/rc.cpp'
--- a/libbase/rc.cpp    2009-02-25 22:33:03 +0000
+++ b/libbase/rc.cpp    2009-02-26 08:04:27 +0000
@@ -98,7 +98,8 @@
     _sollocaldomain(false),
     _lcdisabled(false),
     _lctrace(true),
-    // TODO: give a  default value, and let 0 mean "disabled" -- 0 currently 
is overridden by libbase/shm.cpp 
+    // TODO: give a  default value, and let 0 mean "disabled" -- 0
+    // currently is overridden by libbase/shm.cpp 
     _lcshmkey(0),
     _ignoreFSCommand(true),
     _quality(-1),
@@ -108,13 +109,13 @@
     _useXv(false)
 {
     expandPath(_solsandbox);
-
     loadFiles();
 
 #ifdef __OS2__x
-    _urlOpenerFormat = PrfQueryProfileString( HINI_USER, (PSZ) 
"WPURLDEFAULTSETTINGS",
+    _urlOpenerFormat = PrfQueryProfileString(HINI_USER, (PSZ)
+            "WPURLDEFAULTSETTINGS",
             (PSZ) "DefaultBrowserExe", NULL,
-            (PVOID) browserExe, (LONG)sizeof(browserExe) );
+            (PVOID) browserExe, (LONG)sizeof(browserExe));
     _urlOpenerFormat += " -remote 'openurl(%u)'";
 #endif
 
@@ -136,7 +137,9 @@
 
     // Check the default system location
     std::string loadfile = SYSCONFDIR;
-#ifndef __OS2__ // On OS/2 - only look in %HOME%
+
+#ifndef __OS2__ 
+    // On OS/2 only look in %HOME%
     loadfile.append("/gnashrc");
     parseFile(loadfile);
 #endif

=== modified file 'libcore/as_environment.cpp'
--- a/libcore/as_environment.cpp        2009-01-22 20:10:39 +0000
+++ b/libcore/as_environment.cpp        2009-02-26 08:04:27 +0000
@@ -939,7 +939,8 @@
     // TODO: override from gnashrc.
     
     // A stack size of 0 is apparently legitimate.
-    const boost::uint16_t maxstacksize = 
func->getVM().getRoot().getRecursionLimit();
+    const boost::uint16_t maxstacksize = 
+        func->getVM().getRoot().getRecursionLimit();
 
     // Doesn't proceed if the stack size would reach the limit; should
     // this check be done somewhere after adding to the stack? Would
@@ -947,7 +948,8 @@
     if ( _localFrames.size() + 1 >= maxstacksize )
     {
         std::ostringstream ss;
-        ss << boost::format(_("Max stack count reached (%u)")) % 
_localFrames.size();
+        ss << boost::format(_("Max stack count reached (%u)")) % 
+            _localFrames.size();
 
         // throw something
         throw ActionLimitException(ss.str());