Attachment 122216 Details for Bug 165348 – file.diff

[patch] file.diff

file.diff (text/plain), 1.22 KB, created by Pedro F. Giffuni on 2012-02-21 04:30:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2012-02-21 04:30:10 UTC

Size: 1.22 KB

patch

obsolete

>diff -ruN libiconv.orig/files/patch-include_iconv.h.in libiconv/files/patch-include_iconv.h.in
>--- libiconv.orig/files/patch-include_iconv.h.in	1969-12-31 19:00:00.000000000 -0500
>+++ libiconv/files/patch-include_iconv.h.in	2012-02-20 23:08:20.000000000 -0500
>@@ -0,0 +1,44 @@
>+diff --git include/iconv.h.in include/iconv.h.in
>+--- include/iconv.h.in
>++++ include/iconv.h.in
>+@@ -89,6 +89,11 @@ extern size_t iconv (iconv_t cd, @ICONV_CONST@ char* * inbuf, size_t *inbyteslef
>+ extern int iconv_close (iconv_t cd);
>+ 
>+ 
>++#ifdef __cplusplus
>++}
>++#endif
>++
>++
>+ #ifndef LIBICONV_PLUG
>+ 
>+ /* Nonstandard extensions. */
>+@@ -106,6 +111,10 @@ extern int iconv_close (iconv_t cd);
>+ #include <wchar.h>
>+ #endif
>+ 
>++#ifdef __cplusplus
>++extern "C" {
>++#endif
>++
>+ /* A type that holds all memory needed by a conversion descriptor.
>+    A pointer to such an object can be used as an iconv_t. */
>+ typedef struct {
>+@@ -223,12 +232,11 @@ extern const char * iconv_canonicalize (const char * name);
>+ extern void libiconv_set_relocation_prefix (const char *orig_prefix,
>+                                             const char *curr_prefix);
>+ 
>+-#endif
>+-
>+-
>+ #ifdef __cplusplus
>+ }
>+ #endif
>+ 
>++#endif
>++
>+ 
>+ #endif /* _LIBICONV_H */
>+-- 
>+1.7.2.5
>+

Actions: View | Diff

Attachments on bug 165348: 122216