Changeset 4822

Timestamp:

06/17/12 14:36:30 (11 months ago)

Author:

sam

Message:

win32: define a custom sprintf_s() weak symbol. The VS2010 runtime does not
provide the deprecated snprintf(). The mingw32 runtime does not provide the
MS-specific sprintf_s(). Mingw-w64 copes with both. So we switch to sprintf_s
but also provide it as a weak symbol so that mingw32 does not complain.

Location:

libcaca/trunk/caca

Files:

• caca.h (modified) (1 diff)
• canvas.c (modified) (2 diffs)
• figfont.c (modified) (2 diffs)
• string.c (modified) (2 diffs)

libcaca/trunk/caca/caca.h

@@ -688 +688 @@
 #   else
 #       define CACA_ALIAS(x)
+#   endif
+
+#   if defined __GNUC__ && __GNUC__ > 3
+#       define CACA_WEAK __attribute__ ((weak))
+#   else
+#       define CACA_WEAK
 #   endif
 

libcaca/trunk/caca/canvas.c

@@ -342 +342 @@
  *  (inclusive).
  */
+static caca_timer_t timer = {0, 0};
+
 int caca_rand(int min, int max)
 {
@@ -348 +350 @@
     if(need_init)
     {
-        srand(getpid() + time(NULL));
+        srand(getpid() + _caca_getticks(&timer));
         need_init = 0;
     }

libcaca/trunk/caca/figfont.c

@@ -29 +29 @@
 #include "caca.h"
 #include "caca_internals.h"
+
+#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3
+int sprintf_s(char *s, size_t n, const char *fmt, ...) CACA_WEAK;
+#endif
 
 struct caca_charfont
@@ -624 +628 @@
 
 /*
+ * Functions for the mingw32 runtime
+ */
+
+#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3
+int sprintf_s(char *s, size_t n, const char *fmt, ...)
+{
+    va_list args;
+    int ret;
+    va_start(args, fmt);
+    ret = vsnprintf(s, n, fmt, args);
+    va_end(args);
+    return ret;
+}
+#endif
+
+/*
  * XXX: The following functions are aliases.
  */

libcaca/trunk/caca/string.c

@@ -36 +36 @@
 #include "caca.h"
 #include "caca_internals.h"
+
+#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;
+#endif
 
 /** \brief Set cursor position.
@@ -597 +602 @@
     return 0;
 }
+
+/*
+ * Functions for the mingw32 runtime
+ */
+
+#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);
+}
+#endif
 
 /*