Changeset 1490


Ignore:
Timestamp:
Jun 17, 2012, 2:41:40 PM (8 years ago)
Author:
sam
Message:

build: import new libcaca binaries (from r4822) so that we no longer need
to provide sprintf_s and others when building with mingw32.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/neercs/neercs.cpp

    r1486 r1490  
    4444#include "neercs.h"
    4545#include "video/render.h"
    46 
    47 /* FIXME: ugly MinGW hack */
    48 #if defined _WIN32 && defined __GNUC__
    49 extern "C"
    50 {
    51 int sprintf_s(char *s, size_t n, const char *fmt, ...)
    52 {
    53     va_list args;
    54     int ret;
    55     va_start(args, fmt);
    56     ret = vsnprintf(s, n, fmt, args);
    57     va_end(args);
    58     return ret;
    59 }
    60 
    61 int vsnprintf_s(char *s, size_t n, size_t c, const char *fmt, va_list args)
    62 {
    63     return vsnprintf(s, n, fmt, args);
    64 }
    65 
    66 int _time32(__time32_t *timer)
    67 {
    68     return 0;
    69 }
    70 }
    71 #endif
    7246
    7347Neercs::Neercs()

  • trunk/tools/make-font.cpp

    r1486 r1490  
    1212
    1313#include <caca.h>
    14 
    15 /* FIXME: ugly MinGW hack */
    16 #if defined _WIN32 && defined __GNUC__
    17 extern "C"
    18 {
    19 int sprintf_s(char *s, size_t n, const char *fmt, ...)
    20 {
    21     va_list args;
    22     int ret;
    23     va_start(args, fmt);
    24     ret = vsnprintf(s, n, fmt, args);
    25     va_end(args);
    26     return ret;
    27 }
    28 
    29 int vsnprintf_s(char *s, size_t n, size_t c, const char *fmt, va_list args)
    30 {
    31     return vsnprintf(s, n, fmt, args);
    32 }
    33 
    34 int _time32(__time32_t *timer)
    35 {
    36     return 0;
    37 }
    38 }
    39 #endif
    4014
    4115int main(void)
Note: See TracChangeset for help on using the changeset viewer.