Fix: MIME encode ISO-2022-JP after US-ASCII is broken. [ruby-dev:39722]

[nkf/nkf.git] / nkf32dll.c

diff --git a/nkf32dll.c b/nkf32dll.c
index b85f2ea..1c48eda 100644 (file)
--- a/nkf32dll.c
+++ b/nkf32dll.c
@@ -4,11 +4,11 @@
 
 /*WIN32DLL*/
 /* \82±\82¿\82ç\82Ì\83o\81[\83W\83\87\83\93\82à\8dX\90V\82µ\82Ä\82­\82¾\82³\82¢\81B */
-#define NKF_VERSIONW L"2.0.9"
+#define NKF_VERSIONW L"2.1.0"
 /* NKF_VERSION \82Ì\83\8f\83C\83h\95¶\8e\9a */
-#define DLL_VERSION   "2.0.9.0 0"
+#define DLL_VERSION   "2.1.0.0 0"
 /* DLL\82ª\95Ô\82· */
-#define DLL_VERSIONW L"2.0.9.0 0"
+#define DLL_VERSIONW L"2.1.0.0 0"
 /* DLL\82ª\95Ô\82· DLL_VERSION \82Ì\83\8f\83C\83h\95¶\8e\9a */
 
 /* nkf32.dll main */
@@ -127,8 +127,8 @@ int
 std_getc(f)
 FILE *f;
 {
-    if (std_gc_ndx){
-        return std_gc_buf[--std_gc_ndx];
+    if (!nkf_buf_empty_p(nkf_state->std_gc_buf)) {
+        return nkf_buf_pop(nkf_state->std_gc_buf);
     } else {
         if ( std_getc_mode == 1 ) {
             return getc(f);