1 | diff -r -u libcaca-0.99.beta16-old/caca/caca.h libcaca-0.99.beta16-new/caca/caca.h
|
---|
2 | --- libcaca-0.99.beta16-old/caca/caca.h 2008-09-29 23:01:48 +0000
|
---|
3 | +++ libcaca-0.99.beta16-new/caca/caca.h 2008-10-22 09:37:10 +0000
|
---|
4 | @@ -28,10 +28,18 @@
|
---|
5 |
|
---|
6 | #undef __extern
|
---|
7 | #if defined(_DOXYGEN_SKIP_ME)
|
---|
8 | -#elif defined(_WIN32) && defined(__LIBCACA__)
|
---|
9 | +#elif defined(_WIN32)
|
---|
10 | +# ifdef __LIBCACA__
|
---|
11 | +# ifdef DLL_EXPORT
|
---|
12 | # define __extern extern __declspec(dllexport)
|
---|
13 | -#else
|
---|
14 | +# else
|
---|
15 | # define __extern extern
|
---|
16 | +# endif
|
---|
17 | +# else
|
---|
18 | +# define __extern extern __declspec(dllimport)
|
---|
19 | +# endif
|
---|
20 | +#else
|
---|
21 | +# define __extern extern
|
---|
22 | #endif
|
---|
23 |
|
---|
24 | /** libcaca API version */
|
---|
25 | @@ -473,7 +481,11 @@
|
---|
26 |
|
---|
27 | # if defined __GNUC__ && __GNUC__ >= 3
|
---|
28 | # define CACA_DEPRECATED __attribute__ ((__deprecated__))
|
---|
29 | -# define CACA_ALIAS(x) __attribute__ ((weak, alias(#x)))
|
---|
30 | +# if __GNUC__ > 3
|
---|
31 | +# define CACA_ALIAS(x) __attribute__ ((weak, alias(#x)))
|
---|
32 | +# else
|
---|
33 | +# define CACA_ALIAS(x) __attribute__ ((alias(#x)))
|
---|
34 | +# endif
|
---|
35 | # else
|
---|
36 | # define CACA_DEPRECATED
|
---|
37 | # define CACA_ALIAS(x)
|
---|
38 | diff -r -u libcaca-0.99.beta16-old/caca/caca0.h libcaca-0.99.beta16-new/caca/caca0.h
|
---|
39 | --- libcaca-0.99.beta16-old/caca/caca0.h 2008-09-29 23:01:48 +0000
|
---|
40 | +++ libcaca-0.99.beta16-new/caca/caca0.h 2008-10-22 09:23:58 +0000
|
---|
41 | @@ -24,10 +24,18 @@
|
---|
42 |
|
---|
43 | #undef __extern
|
---|
44 | #if defined(_DOXYGEN_SKIP_ME)
|
---|
45 | -#elif defined(_WIN32) && defined(__LIBCACA__)
|
---|
46 | +#elif defined(_WIN32)
|
---|
47 | +# ifdef __LIBCACA__
|
---|
48 | +# ifdef DLL_EXPORT
|
---|
49 | # define __extern extern __declspec(dllexport)
|
---|
50 | -#else
|
---|
51 | +# else
|
---|
52 | # define __extern extern
|
---|
53 | +# endif
|
---|
54 | +# else
|
---|
55 | +# define __extern extern __declspec(dllimport)
|
---|
56 | +# endif
|
---|
57 | +#else
|
---|
58 | +# define __extern extern
|
---|
59 | #endif
|
---|
60 |
|
---|
61 | #ifdef __cplusplus
|
---|
62 | @@ -205,4 +213,6 @@
|
---|
63 | }
|
---|
64 | #endif
|
---|
65 |
|
---|
66 | +#undef __extern
|
---|
67 | +
|
---|
68 | #endif /* __CACA0_H__ */
|
---|
69 | diff -r -u libcaca-0.99.beta16-old/tools/makefont.c libcaca-0.99.beta16-new/tools/makefont.c
|
---|
70 | --- libcaca-0.99.beta16-old/tools/makefont.c 2008-09-27 15:58:05 +0000
|
---|
71 | +++ libcaca-0.99.beta16-new/tools/makefont.c 2008-10-22 09:13:22 +0000
|
---|
72 | @@ -25,6 +25,10 @@
|
---|
73 | # include <arpa/inet.h>
|
---|
74 | #elif defined HAVE_NETINET_IN_H
|
---|
75 | # include <netinet/in.h>
|
---|
76 | +#elif defined HAVE_WINSOCK2_H
|
---|
77 | +# define WIN32_LEAN_AND_MEAN
|
---|
78 | +# include <winsock2.h>
|
---|
79 | +# define NEED_WINSOCK2
|
---|
80 | #endif
|
---|
81 |
|
---|
82 | #include <pango/pango.h>
|
---|
83 | @@ -101,6 +105,9 @@
|
---|
84 |
|
---|
85 | unsigned int bpp, dpi;
|
---|
86 | char const *prefix, *font;
|
---|
87 | +#ifdef NEED_WINSOCK2
|
---|
88 | + WSADATA wsaData;
|
---|
89 | +#endif
|
---|
90 |
|
---|
91 | if(argc != 5)
|
---|
92 | {
|
---|
93 | @@ -123,6 +130,10 @@
|
---|
94 |
|
---|
95 | fprintf(stderr, "Font \"%s\", %i dpi, %i bpp\n", font, dpi, bpp);
|
---|
96 |
|
---|
97 | +#ifdef NEED_WINSOCK2
|
---|
98 | + /* initialize Winsock */
|
---|
99 | + WSAStartup((WORD)MAKEWORD(2, 0), &wsaData);
|
---|
100 | +#endif
|
---|
101 | /* Initialise Pango */
|
---|
102 | fm = pango_ft2_font_map_new();
|
---|
103 | pango_ft2_font_map_set_resolution(PANGO_FT2_FONT_MAP(fm), dpi, dpi);
|
---|