diff options
author | nobutaka <nobutaka@FreeBSD.org> | 2008-03-23 23:06:40 +0800 |
---|---|---|
committer | nobutaka <nobutaka@FreeBSD.org> | 2008-03-23 23:06:40 +0800 |
commit | 84c6702881ac4eda9d39f5383f5fb5964fade333 (patch) | |
tree | b85e3b6cf1f49e3bafd85d97360ee28f86e493f3 /textproc/uim/files | |
parent | 9ee68e9c1f29194cf4fb135b72826f6b755cd486 (diff) | |
download | freebsd-ports-gnome-84c6702881ac4eda9d39f5383f5fb5964fade333.tar.gz freebsd-ports-gnome-84c6702881ac4eda9d39f5383f5fb5964fade333.tar.zst freebsd-ports-gnome-84c6702881ac4eda9d39f5383f5fb5964fade333.zip |
Update to 1.4.2.
Diffstat (limited to 'textproc/uim/files')
-rw-r--r-- | textproc/uim/files/patch-sigscheme_configure | 13 | ||||
-rw-r--r-- | textproc/uim/files/patch-sigscheme_src_alloc.c | 31 | ||||
-rw-r--r-- | textproc/uim/files/patch-sigscheme_src_sigscheme.h | 10 | ||||
-rw-r--r-- | textproc/uim/files/patch-sigscheme_src_storage-compact.h | 22 |
4 files changed, 0 insertions, 76 deletions
diff --git a/textproc/uim/files/patch-sigscheme_configure b/textproc/uim/files/patch-sigscheme_configure deleted file mode 100644 index 149b508b56ea..000000000000 --- a/textproc/uim/files/patch-sigscheme_configure +++ /dev/null @@ -1,13 +0,0 @@ ---- sigscheme/configure.orig 2007-09-25 00:33:59.000000000 +0900 -+++ sigscheme/configure 2007-09-25 00:34:05.000000000 +0900 -@@ -44974,7 +44974,9 @@ - _ax_feature_list_expanded='' - for feature in $ax_feature_list_all; do - _ax_feature_val=`eval echo '${'use_$feature'}'` -- _ax_feature_val=${_ax_feature_val:no} -+ if test -z $_ax_feature_val; then -+ _ax_feature_val=no -+ fi - if test "x$_ax_feature_val" != xno; then - _ax_feature_list_expanded="$_ax_feature_list_expanded $feature" - fi diff --git a/textproc/uim/files/patch-sigscheme_src_alloc.c b/textproc/uim/files/patch-sigscheme_src_alloc.c deleted file mode 100644 index 62ee857a733c..000000000000 --- a/textproc/uim/files/patch-sigscheme_src_alloc.c +++ /dev/null @@ -1,31 +0,0 @@ ---- sigscheme/src/alloc.c.orig 2007-01-07 01:46:46.000000000 +0900 -+++ sigscheme/src/alloc.c 2007-11-04 18:01:05.000000000 +0900 -@@ -181,7 +181,6 @@ - return copied; - } - --#if 0 - /* For 'name' slot of symbol object on storage-compact. If your malloc(3) does - * not ensure 8-bytes alignment, Complete this function and hook this into - * symbol object creation and modification. -- YamaKen 2006-05-30 */ -@@ -192,17 +191,16 @@ - size_t size; - - /* Use ScmCell-alignment to ensure at least 8-bytes aligned. */ -- if ((uintptr_t)ptr % sizeof(ScmCell)) { -+ if ((uintptr_t)str % sizeof(ScmCell)) { - size = strlen(str) + sizeof(""); -- copied = scm_malloc_aligned8(size); -+ copied = scm_malloc_aligned(size); - strcpy(copied, str); - free(str); - return copied; - } else { -- return ptr; -+ return str; - } - } --#endif - - /*======================================= - Extendable Local Buffer diff --git a/textproc/uim/files/patch-sigscheme_src_sigscheme.h b/textproc/uim/files/patch-sigscheme_src_sigscheme.h deleted file mode 100644 index 872ddf216b23..000000000000 --- a/textproc/uim/files/patch-sigscheme_src_sigscheme.h +++ /dev/null @@ -1,10 +0,0 @@ ---- sigscheme/src/sigscheme.h.orig 2007-03-15 01:15:06.000000000 +0900 -+++ sigscheme/src/sigscheme.h 2007-11-04 18:01:05.000000000 +0900 -@@ -1242,6 +1242,7 @@ - SCM_EXPORT void *scm_calloc(size_t number, size_t size); - SCM_EXPORT void *scm_realloc(void *ptr, size_t size); - SCM_EXPORT char *scm_strdup(const char *str); -+SCM_EXPORT char *scm_align_str(char *str); - - /* storage-gc.c */ - SCM_EXPORT void scm_gc_protect(ScmObj *var); diff --git a/textproc/uim/files/patch-sigscheme_src_storage-compact.h b/textproc/uim/files/patch-sigscheme_src_storage-compact.h deleted file mode 100644 index acaa19292191..000000000000 --- a/textproc/uim/files/patch-sigscheme_src_storage-compact.h +++ /dev/null @@ -1,22 +0,0 @@ ---- sigscheme/src/storage-compact.h.orig 2007-01-07 01:46:46.000000000 +0900 -+++ sigscheme/src/storage-compact.h 2007-11-04 18:01:05.000000000 +0900 -@@ -639,11 +639,14 @@ - (SCM_ASSERT(SCM_ALIGNED_SYMBOL_NAME(n)), \ - SCM_SET_Y(SCM_SYMBOL_PTR(o), (scm_uintobj_t)(n) | SCM_MTAG_SYMBOL)) - #define SCM_ISAL_SYMBOL_INIT(o, n, c) \ -- (SCM_ASSERT(SCM_ALIGNED_SYMBOL_NAME(n)), \ -- SCM_INIT((o), \ -- (c), \ -- (scm_uintobj_t)(n) | SCM_MTAG_SYMBOL, \ -- SCM_PTAG_MISC)) -+ do { \ -+ char *_s = scm_align_str(n); \ -+ (SCM_ASSERT(SCM_ALIGNED_SYMBOL_NAME(_s)), \ -+ SCM_INIT((o), \ -+ (c), \ -+ (scm_uintobj_t)(_s) | SCM_MTAG_SYMBOL, \ -+ SCM_PTAG_MISC)); \ -+ } while (0) - #define SCM_CELL_SYMBOLP(c) SCM_MISC_CELL_TYPEP((c), SYMBOL) - #define SCM_CELL_SYMBOL_FIN(c) \ - do { \ |