diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2005-06-26 19:42:42 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2005-06-26 19:42:42 +0000 |
| commit | ef48641145fc2606ccae4cf73f96a33bc99d29a5 (patch) | |
| tree | ee764985d3f43c618a44b333b28522c2ff71d3c6 /textproc/uim/files/patch-uim:context.h | |
| parent | Update to 4.22. See http://www.jwz.org/xscreensaver/changelog.html for a (diff) | |
Update to 0.4.7.
Notes
Notes:
svn path=/head/; revision=138048
Diffstat (limited to 'textproc/uim/files/patch-uim:context.h')
| -rw-r--r-- | textproc/uim/files/patch-uim:context.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/textproc/uim/files/patch-uim:context.h b/textproc/uim/files/patch-uim:context.h deleted file mode 100644 index fc4da7781f4c..000000000000 --- a/textproc/uim/files/patch-uim:context.h +++ /dev/null @@ -1,22 +0,0 @@ ---- uim/context.h.orig Sat Feb 5 11:50:05 2005 -+++ uim/context.h Sun Jun 5 16:43:06 2005 -@@ -156,13 +156,16 @@ - - #ifdef ENABLE_NLS - #define UIM_PREPARE_SAVING_TEXTDOMAIN_CODESET() \ -- const char *orig_encoding, *client_encoding; -+ char *enc, *orig_encoding = NULL; \ -+ const char *client_encoding; - #define UIM_SWITCH_TEXTDOMAIN_CODESET(uc) \ -- orig_encoding = bind_textdomain_codeset(GETTEXT_PACKAGE, NULL); \ -+ if ((enc = bind_textdomain_codeset(GETTEXT_PACKAGE, NULL))) \ -+ orig_encoding = strdup(enc); \ - client_encoding = (uc) ? ((struct uim_context_ *)uc)->encoding : uim_last_client_encoding; \ - bind_textdomain_codeset(GETTEXT_PACKAGE, client_encoding); - #define UIM_RESTORE_TEXTDOMAIN_CODESET() \ -- bind_textdomain_codeset(GETTEXT_PACKAGE, orig_encoding); -+ bind_textdomain_codeset(GETTEXT_PACKAGE, orig_encoding); \ -+ free(orig_encoding); - #else /* ENABLE_NLS */ - #define UIM_PREPARE_SAVING_TEXTDOMAIN_CODESET() - #define UIM_SWITCH_TEXTDOMAIN_CODESET(uc) |