Changeset 349 for ps

Timestamp:

06/02/04 17:12:48 (21 years ago)

Author:

Simon Brenner

Message:

../lib/lib.cpp

Location:

ps/trunk/source/lib

Files:

• lib.h (modified) (7 diffs)
• sysdep/sysdep.cpp (modified) (2 diffs)
• sysdep/sysdep.h (modified) (1 diff)

ps/trunk/source/lib/lib.h

@@ -56 +56 @@
 
 
+#ifdef _WIN32
 #define CHECK_ERR(func)\
 STMT(\
@@ -66 +67 @@
     }\
 )
-
+#else
+#define CHECK_ERR(func)\
+STMT(\
+    int err = (int)(func);\
+    if(err < 0)\
+    {\
+        debug_out("%s:%d: FYI: CHECK_ERR reports that a function failed."\
+                    "feel free to ignore or suppress this warning.", __FILE__, __LINE__);\
+        return err;\
+    }\
+)
+#endif
 
 enum LibError
@@ -132 +144 @@
 // VC6/7 don't realize the macro is constant
 // (it should be useable as a switch{} expression)
-#ifdef BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
 #define FOURCC(a,b,c,d) ( ((u32)a << 24) | ((u32)b << 16) | \
     ((u32)c << 8 ) | ((u32)d << 0 ) )
@@ -186 +198 @@
 // no parameters, cdecl (CC_CDECL_0)
 extern int atexit2(void* func);
+inline int atexit2(void (*func)())
+{
+    atexit2((void *)func);
+}
 
 
@@ -227 +243 @@
 static inline u16 read_le16(const void* p)
 {
-#ifdef BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
     const u8* _p = (const u8*)p;
     return (u16)_p[0] | (u16)_p[1] << 8;
@@ -238 +254 @@
 static inline u32 read_le32(const void* p)
 {
-#ifdef BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
     u32 t = 0;
     for(int i = 0; i < 4; i++)
@@ -270 +286 @@
 
 
-extern long round(double);
 extern u16 fp_to_u16(double in);
 

ps/trunk/source/lib/sysdep/sysdep.cpp

@@ -17 +17 @@
 void wdisplay_msg(const wchar_t* caption, const wchar_t* msg)
 {
-    fwprintf(stderr, L"%ws: %ws\n", caption, msg);
+    fwprintf(stderr, L"%ls: %ls\n", caption, msg);
 }
 
@@ -37 +37 @@
 
 #endif  // #ifndef _WIN32
+
+#ifdef _MSC_VER
+
+double round(double x)
+{
+    return (long)(x + 0.5);
+}
+
+#endif

ps/trunk/source/lib/sysdep/sysdep.h

@@ -16 +16 @@
 extern void check_heap();
 
+#ifdef _MSC_VER
+extern double round(double);
+#endif
+
 #ifdef __cplusplus
 }