From 78ea2e1523f136f87feedd67e9f1850b3e99e726 Mon Sep 17 00:00:00 2001 From: h_vogt Date: Sun, 12 Feb 2017 23:02:43 +0100 Subject: [PATCH] winmain.c, remove of fcn 'read' in Windows --- src/include/ngspice/wstdio.h | 12 ------------ src/winmain.c | 26 -------------------------- 2 files changed, 38 deletions(-) diff --git a/src/include/ngspice/wstdio.h b/src/include/ngspice/wstdio.h index d5ec52631..2823a3328 100644 --- a/src/include/ngspice/wstdio.h +++ b/src/include/ngspice/wstdio.h @@ -44,18 +44,6 @@ int win_x_vfprintf(FILE *stream, const char *format, void *arglist); int win_x_vprintf(const char *format, void *arglist); /* int win_x_vscanf(const char *format, void *arglist); */ -#ifdef _MSC_VER -#if _MSC_VER < 1500 -/* VC++ 6.0, VC++ 2005 */ -_CRTIMP int __cdecl read(int fd, void *buf, unsigned int n); -#else -/* VC++ 2008 */ -_CRTIMP int __cdecl read(int fd, _Out_bytecap_(_MaxCharCount) void *buf, _In_ unsigned int n); -#endif -#else -int win_x_read(int fd, char *buf, int n); -#endif - int win_x_getc(FILE *fp); int win_x_getchar(void); int win_x_putchar(const int c); diff --git a/src/winmain.c b/src/winmain.c index 3b5f54b4a..e1fdf0f9b 100644 --- a/src/winmain.c +++ b/src/winmain.c @@ -1407,32 +1407,6 @@ win_x_vscanf(const char *format, void *arglist) #endif -int -win_x_read(int fd, char *buf, int n) -{ - if (fd == 0) { - int i = 0; - int c; - char s[IOBufSize]; - while (i < n) { - c = w_getch(); - if (c == LF) { -// s[i++] = LF; - break; - } - if (c != CR) - s[i++] = (char)c; - } -// s[i] = SE; - buf = &s[0]; - return i; - } - else { - return _read(fd, buf, n); - } -} - - int win_x_getc(FILE *fp) {