From 517346d0c427d8411208c819de59e90325d83bfe Mon Sep 17 00:00:00 2001 From: Rei FURUKAWA Date: Tue, 25 Mar 2003 03:03:22 +0000 Subject: [PATCH 1/1] =?utf8?q?Windows=20=E3=81=AE=E3=82=B3=E3=83=B3?= =?utf8?q?=E3=83=91=E3=82=A4=E3=83=A9=E3=81=A7=E9=80=9A=E3=82=8B=E3=82=88?= =?utf8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=20(=E9=B6=B4=E8=B0=B7@?= =?utf8?q?=E4=BA=AC=E9=83=BD=E3=81=95=E3=82=93)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nkf.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/nkf.c b/nkf.c index 23e6a99..06e8092 100644 --- a/nkf.c +++ b/nkf.c @@ -95,8 +95,11 @@ static char *Patchlevel = ** **/ -#if (defined(__TURBOC__) || defined(LSI_C)) && !defined(MSDOS) +#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C)) && !defined(MSDOS) #define MSDOS +#if (defined(__Win32__) || defined(_WIN32)) && !defined(__WIN32__) +#define __WIN32__ +#endif #endif #ifdef PERL_XS @@ -125,7 +128,7 @@ static char *Patchlevel = #define setbinmode(fp) #endif -#ifdef _IOFBF /* SysV and MSDOS */ +#ifdef _IOFBF /* SysV and MSDOS, Windows */ #define setvbuffer(fp, buf, size) setvbuf(fp, buf, _IOFBF, size) #else /* BSD */ #define setvbuffer(fp, buf, size) setbuffer(fp, buf, size) @@ -134,15 +137,25 @@ static char *Patchlevel = /*Borland C++ 4.5 EasyWin*/ #if defined(__TURBOC__) && defined(_Windows) && !defined(__WIN32__) /*Easy Win */ #define EASYWIN +#ifndef __WIN16__ +#define __WIN16__ +#endif #include #endif #ifdef OVERWRITE /* added by satoru@isoternet.org */ #include -#ifndef MSDOS +#ifndef MSDOS /* UNIX, OS/2 */ #include #include +#else +#if defined(_MSC_VER) /* VC++ */ +#include +#elif defined(__TURBOC__) /* BCC */ +#include +#elif defined(LSI_C) /* LSI C */ +#endif #endif #endif @@ -3624,13 +3637,13 @@ void version() { fprintf(stderr,"Network Kanji Filter Version %s (%s) " -#if defined(MSDOS) && !defined(_Windows) +#if defined(MSDOS) && !defined(__WIN32__) && !defined(__WIN16__) "for DOS" #endif -#if !defined(__WIN32__) && defined(_Windows) +#if defined(MSDOS) && defined(__WIN16__) "for Win16" #endif -#if defined(__WIN32__) && defined(_Windows) +#if defined(MSDOS) && defined(__WIN32__) "for Win32" #endif #ifdef __OS2__ -- 2.11.0