Changeset 4823Tweet

Timestamp:

06/17/12 16:05:44 (12 months ago)

Author:

sam

Message:

build: ship a weak symbol for vsnprintf, too, because our weak symbol for
sprintf_s uses that function and VS2010 does not strip it off even if it
is unused. Also do not use 64-bit integer division in the timer code because
that will create unwanted references to _moddi3 and _divdi3.

Location:

libcaca/trunk/caca

Files:

• canvas.c (modified) (1 diff)
• figfont.c (modified) (2 diffs)
• string.c (modified) (2 diffs)
• time.c (modified) (3 diffs)

libcaca/trunk/caca/canvas.c

@@ -1 +1 @@
 /*
  *  libcaca       Colour ASCII-Art library
- *  Copyright (c) 2002-2010 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2002-2012 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *

libcaca/trunk/caca/figfont.c

@@ -32 +32 @@
 #if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3
 int sprintf_s(char *s, size_t n, const char *fmt, ...) CACA_WEAK;
+int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) CACA_WEAK;
 #endif
 
@@ -641 +642 @@
     return ret;
 }
+
+int vsnprintf(char *s, size_t n, const char *fmt, va_list ap)
+{
+    return 0;
+}
 #endif
 

libcaca/trunk/caca/string.c

@@ -39 +39 @@
 #if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3
 int vsnprintf_s(char *s, size_t n, size_t c,
-                const char *fmt, va_list args) CACA_WEAK;
+                const char *fmt, va_list ap) CACA_WEAK;
+int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) CACA_WEAK;
 #endif
 
@@ -608 +609 @@
 
 #if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3
-int vsnprintf_s(char *s, size_t n, size_t c, const char *fmt, va_list args)
-{
-    return vsnprintf(s, n, fmt, args);
+int vsnprintf_s(char *s, size_t n, size_t c, const char *fmt, va_list ap)
+{
+    return vsnprintf(s, n, fmt, ap);
+}
+
+int vsnprintf(char *s, size_t n, const char *fmt, va_list ap)
+{
+    return 0;
 }
 #endif

libcaca/trunk/caca/time.c

@@ -1 +1 @@
 /*
  *  libcaca       Colour ASCII-Art library
- *  Copyright (c) 2002-2010 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2002-2012 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *
@@ -36 +36 @@
 void _caca_sleep(int usec)
 {
-#if defined(HAVE_USLEEP)
+#if defined(HAVE_SLEEP)
+    Sleep((usec + 500) / 1000);
+#elif defined(HAVE_USLEEP)
     usleep(usec);
-#elif defined(HAVE_SLEEP)
-    Sleep((usec + 500) / 1000);
 #else
     /* SLEEP */
@@ -47 +47 @@
 int _caca_getticks(caca_timer_t *timer)
 {
-#if defined(HAVE_GETTIMEOFDAY)
+#if defined(USE_WIN32)
+    LARGE_INTEGER tmp;
+    static double freq = -1.0; /* FIXME: can this move to caca_context? */
+    double seconds;
+#elif defined(HAVE_GETTIMEOFDAY)
     struct timeval tv;
-#elif defined(USE_WIN32)
-    static __int64 freq = -1; /* FIXME: can this move to caca_context? */
-    __int64 usec;
 #endif
     int ticks = 0;
     int new_sec, new_usec;
 
-#if defined(HAVE_GETTIMEOFDAY)
+#if defined(USE_WIN32)
+    if (freq < 0.0)
+    {
+        if(!QueryPerformanceFrequency(&tmp))
+            freq = 0.0;
+        else
+            freq = 1.0 / (double)tmp.QuadPart;
+    }
+
+    QueryPerformanceCounter(&tmp);
+    seconds = freq * (double)tmp.QuadPart;
+    new_sec = (int)seconds;
+    new_usec = (int)((seconds - new_sec) * 1000000.0);
+#elif defined(HAVE_GETTIMEOFDAY)
     gettimeofday(&tv, NULL);
     new_sec = tv.tv_sec;
     new_usec = tv.tv_usec;
-#elif defined(USE_WIN32)
-    if(freq == -1)
-    {
-        if(!QueryPerformanceFrequency((LARGE_INTEGER *)&freq))
-            freq = 0;
-    }
-
-    QueryPerformanceCounter((LARGE_INTEGER *)&usec);
-    new_sec = (int)(usec * 1000000 / freq / 1000000);
-    new_usec = (int)((usec * 1000000 / freq) % 1000000);
 #endif