comparison: sswf/sswf.patch
sswf/sswf.patch
- changeset 696
- 106023deee59
- parent 110
- b70af19a3465
equal
deleted
inserted
replaced
| 0:bcb033b8d2ef | 1:87144fd2b8c5 |
|---|---|
| 35 -#if IRIX | 35 -#if IRIX |
| 36 +#if IRIX || defined(__FreeBSD__) | 36 +#if IRIX || defined(__FreeBSD__) |
| 37 #include <inttypes.h> | 37 #include <inttypes.h> |
| 38 #endif | 38 #endif |
| 39 #include <sswf/libsswf-config.h> | 39 #include <sswf/libsswf-config.h> |
| 40 Index: src/lib/libsswf_tag_header.c++ | |
| 41 --- src/lib/libsswf_tag_header.c++.orig 2009-02-25 11:44:25.018888440 +0100 | |
| 42 +++ src/lib/libsswf_tag_header.c++ 2009-02-25 12:03:04.998881702 +0100 | |
| 43 @@ -745,7 +745,7 @@ | |
| 44 } | |
| 45 #endif | |
| 46 | |
| 47 - r = (int) iconv(f_iconvertor, ICONV_INPUT_CAST &string, &in, &p, &out); | |
| 48 + r = (int) iconv(f_iconvertor, ICONV_INPUT_CAST const_cast<char **>(&string), &in, &p, &out); | |
| 49 if(r < 0) { | |
| 50 if(s != buf) { | |
| 51 MemFree(s); | |
| 52 Index: src/lib/sswf_lexical.c++ | |
| 53 --- src/sswf/sswf_lexical.c++.orig 2008-06-23 07:51:47.000000000 +0200 | |
| 54 +++ src/sswf/sswf_lexical.c++ 2009-02-25 12:06:36.214881561 +0100 | |
| 55 @@ -2026,7 +2026,7 @@ | |
| 56 out = sizeof(outchar); | |
| 57 output = (char *) &outchar; | |
| 58 b = (int) f_mb_count; | |
| 59 - a = (int) iconv(f_iconvertor, ICONV_INPUT_CAST &input, &f_mb_count, &output, &out); | |
| 60 + a = (int) iconv(f_iconvertor, ICONV_INPUT_CAST const_cast<char **>(&input), &f_mb_count, &output, &out); | |
| 61 // the output buffer will usually be full before the | |
| 62 // input is fully emptied! | |
| 63 if(a < 0 && errno == E2BIG && out == 0 && b != (int) f_mb_count) { |
