*

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1806 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index 8ab2222..e53f083 100644 (file)
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -2042,7 +2042,7 @@ s_chtml10_start_img_tag(void *pdoc, Node *node)
   request_rec  *r;
   Attr         *attr;
 #ifndef IMG_NOT_CONVERT_FILENAME
-  device_table_t *spec;
+  device_table *spec;
 #endif
 
   chtml10 = GET_CHTML10(pdoc);

diff --git a/src/chxj_emoji.c b/src/chxj_emoji.c
index 168b6b8..b4f30dc 100644 (file)
--- a/src/chxj_emoji.c
+++ b/src/chxj_emoji.c
@@ -2513,7 +2513,6 @@ cmp_as_imode2imode_utf8_bin(
   long src_value = 0;
   long target_value = 0;
 
-#if 1
   src_value = (long)(0xff & src[0]);
   src_value <<= 8;
   src_value |= (long)(0xff & src[1]);
@@ -2525,12 +2524,7 @@ cmp_as_imode2imode_utf8_bin(
   target_value |= (long)(0xff & target->imode.utf8.hex[1]);
   target_value <<= 8;
   target_value |= (long)(0xff & target->imode.utf8.hex[2]);
-#else
-  src_value = strtol(src, NULL, 16);
-  target_value = strtol(target->imode.utf8.hex_string, NULL, 16);
-#endif
-DBG(dbg_r, "src_value =[%d] target_value = [%d]", src_value, target_value);  
-DBG(dbg_r, "src_value=[%.3s] target_value=[%s]", src, target->imode.utf8.hex_string);
+
   return src_value - target_value;
 }
 

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index 614f42f..aaee00f 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -2107,7 +2107,7 @@ s_hdml_start_img_tag(void *pdoc, Node *node)
   hdml_t         *hdml;
   Doc            *doc;
 #ifndef IMG_NOT_CONVERT_FILENAME
-  device_table_t *spec;
+  device_table   *spec;
 #endif
   Attr           *attr;