Index: temp/trunk/data/lib/glib.php
===================================================================
--- temp/trunk/data/lib/glib.php	(revision 6413)
+++ temp/trunk/data/lib/glib.php	(revision 7179)
@@ -23,6 +23,6 @@
 	
 	$return = $header.$contents;
-	if (mb_detect_encoding($return) == 'EUC-JP'){						//ʸ»ú¥³¡¼¥ÉÊÑ´¹
-		$return = mb_convert_encoding($return,'SJIS','EUC-JP');
+	if (mb_detect_encoding($return) == 'CHAR_CODE'){						//ʸ»ú¥³¡¼¥ÉÊÑ´¹
+		$return = mb_convert_encoding($return,'SJIS','CHAR_CODE');
 		$return = str_replace( array( "\r\n", "\r" ), "\n", $return);	// ²þ¹ÔÊýË¡¤ÎÅý°ì
 	}
Index: temp/trunk/data/lib/slib.php
===================================================================
--- temp/trunk/data/lib/slib.php	(revision 6713)
+++ temp/trunk/data/lib/slib.php	(revision 7179)
@@ -130,5 +130,5 @@
 	global $GLOBAL_ERR;
 	if($GLOBAL_ERR == "") {
-		$GLOBAL_ERR = "<meta http-equiv='Content-Type' content='text/html; charset=EUC-JP'>\n";
+		$GLOBAL_ERR = "<meta http-equiv='Content-Type' content='text/html; charset=CHAR_CODE'>\n";
 	}
 	$GLOBAL_ERR.= "<table width='100%' border='0' cellspacing='0' cellpadding='0' summary=' '>\n";
@@ -360,10 +360,10 @@
 	
 	/* i18n¢· ¤À¤ÈÀµ¾ï¤ËÆ°ºî¤·¤Ê¤¤¤¿¤á¡¢mb¢· ¤ËÊѹ¹
-	if (i18n_discover_encoding($data) == 'EUC-JP'){
-		$data = i18n_convert($data,'SJIS','EUC-JP');
+	if (i18n_discover_encoding($data) == 'CHAR_CODE'){
+		$data = i18n_convert($data,'SJIS','CHAR_CODE');
 	}
 	*/
-	if (mb_internal_encoding() == 'EUC-JP'){
-		$data = mb_convert_encoding($data,'SJIS','EUC-JP');
+	if (mb_internal_encoding() == 'CHAR_CODE'){
+		$data = mb_convert_encoding($data,'SJIS','CHAR_CODE');
 	}
 	
@@ -2150,5 +2150,5 @@
 
 // PHP¤Îmb_convert_encoding´Ø¿ô¤òSmarty¤Ç¤â»È¤¨¤ë¤è¤¦¤Ë¤¹¤ë
-function sf_mb_convert_encoding($str, $encode = 'EUC-JP') {
+function sf_mb_convert_encoding($str, $encode = 'CHAR_CODE') {
 	return  mb_convert_encoding($str, $encode);
 }	
Index: temp/trunk/data/lib/gdthumb.php
===================================================================
--- temp/trunk/data/lib/gdthumb.php	(revision 1328)
+++ temp/trunk/data/lib/gdthumb.php	(revision 7179)
@@ -40,5 +40,5 @@
 list($Ck, $Msg) = $objg->Main($_GET["path"], $_GET["mw"], $_GET["mh"]);
 if(!$Ck) { // ¥¨¥é¡¼¤Î¾ì¹ç
-	header("Content-Type: text/html; charset=euc-jp");
+	header("Content-Type: text/html; charset=CHAR_CODE");
 	print $Msg;
 }