Changeset 353 for ps

Timestamp:

06/02/04 17:31:55 (21 years ago)

Author:

Simon Brenner

Message:

Linux/GCC compat, a few newlines at end of file, minor changes

Location:

ps/trunk/source

Files:

• lib/precompiled.h (modified) (1 diff)
• lib/res/file.cpp (modified) (1 diff)
• lib/res/tex.cpp (modified) (2 diffs)
• lib/timer.cpp (modified) (1 diff)
• lib/types.h (modified) (1 diff)
• ps/CStr.cpp (modified) (2 diffs)

ps/trunk/source/lib/precompiled.h

@@ -26 +26 @@
 #pragma warning(disable:4786)   // identifier truncated to 255 chars
 #endif
+
+#include "config.h"

ps/trunk/source/lib/res/file.cpp

@@ -512 +512 @@
         aio_suspend(&cb, 1, NULL);
 
-    p = cb->aio_buf;
+    // posix has aio_buf as volatile void, and gcc doesn't like to cast it
+    // implicitly
+    p = (void *)cb->aio_buf;
 
     // return how much was actually transferred,

ps/trunk/source/lib/res/tex.cpp

@@ -40 +40 @@
 
 #ifndef NO_PNG
-# include <libpng10/png.h>
-# ifdef _MSC_VER
-#  pragma comment(lib, "libpng10.lib")
+# ifdef _WIN32
+#  include <libpng10/png.h>
+# else
+#  include <png.h>
+#  ifdef _MSC_VER
+#   pragma comment(lib, "libpng10.lib")
+#  endif
 # endif
 #endif
@@ -127 +131 @@
 {
     UNUSED(size)    // only need first 4 chars
-
+    
     return *(u32*)ptr == FOURCC('D','D','S',' ');
 }

ps/trunk/source/lib/timer.cpp

@@ -58 +58 @@
 
     gettimeofday(&cur, 0);
-    t = (cur.tv_sec - start.tv_sec) + (cur.tv_nsec - start.tv_nsec)*1e-6;
+    t = (cur.tv_sec - start.tv_sec) + (cur.tv_usec - start.tv_usec)*1e-6;
 
 #else

ps/trunk/source/lib/types.h

@@ -8 +8 @@
 // defines instead of typedefs so we can #undef conflicting decls
 
-#define ulong unsigned long
-
-#define uint unsigned int
+// Workaround: GCC won't parse constructor-casts with multi-word types, while
+// visual studio will. Define uint/long to a namespaced one-word typedef.
+typedef unsigned long PS_ulong;
+typedef unsigned int PS_uint;
+#define ulong PS_ulong
+#define uint PS_uint
 
 #define i8 int8_t

ps/trunk/source/ps/CStr.cpp

@@ -84 +84 @@
 unsigned int CStr::ToUInt() const
 {
-    return unsigned int(_ttoi(m_String.c_str()));
+    return uint(_ttoi(m_String.c_str()));
 }
 
@@ -94 +94 @@
 unsigned long CStr::ToULong() const
 {
-    return unsigned long(_ttol(m_String.c_str()));
+    return ulong(_ttol(m_String.c_str()));
 }