aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRechi <Rechi@users.noreply.github.com>2018-11-26 17:31:33 +0100
committerGitHub <noreply@github.com>2018-11-26 17:31:33 +0100
commitca5e96279a295a7174c1615491b50db4bf4a40e9 (patch)
treee5588832403a4d308a5c03f6ba37bd7ac70f5998
parentc86c69ef820b328af0008b40faa587de95bf4705 (diff)
parent628082c20fbeeaa806b391fd9a3b70d415a8e848 (diff)
Merge pull request #14948 from Rechi/cleanup/VS
[cleanup] remove code for VS lower than 14.0 (2015)
-rw-r--r--xbmc/cores/DllLoader/exports/emu_msvcrt.cpp60
-rw-r--r--xbmc/cores/DllLoader/exports/emu_msvcrt.h5
2 files changed, 0 insertions, 65 deletions
diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
index aea3242ad0..5546f6ecdc 100644
--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
@@ -2043,66 +2043,6 @@ extern "C"
#endif
}
-#if _MSC_VER < 1900
- int dll_filbuf(FILE *fp)
- {
- if (fp == NULL)
- return EOF;
-
- if(IS_STD_STREAM(fp))
- return EOF;
-
- CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(fp);
- if (pFile)
- {
- unsigned char data;
- if(pFile->Read(&data, 1) == 1)
- {
- pFile->Seek(-1, SEEK_CUR);
- return (int)data;
- }
- else
- return EOF;
- }
-#ifdef TARGET_POSIX
- return EOF;
-#else
- return _filbuf(fp);
-#endif
- }
-
- int dll_flsbuf(int data, FILE *fp)
- {
- if (fp == NULL)
- return EOF;
-
- if(IS_STDERR_STREAM(fp) || IS_STDOUT_STREAM(fp))
- {
- CLog::Log(LOGDEBUG, "dll_flsbuf() - %c", data);
- return data;
- }
-
- if(IS_STD_STREAM(fp))
- return EOF;
-
- CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(fp);
- if (pFile)
- {
- pFile->Flush();
- unsigned char c = (unsigned char)data;
- if(pFile->Write(&c, 1) == 1)
- return data;
- else
- return EOF;
- }
-#ifdef TARGET_POSIX
- return EOF;
-#else
- return _flsbuf(data, fp);
-#endif
- }
-
-#endif
// this needs to be wrapped, since dll's have their own file
// descriptor list, but we always use app's list with our wrappers
int __cdecl dll_open_osfhandle(intptr_t _OSFileHandle, int _Flags)
diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.h b/xbmc/cores/DllLoader/exports/emu_msvcrt.h
index 7319240036..eb30c44f09 100644
--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h
+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h
@@ -151,11 +151,6 @@ extern "C"
#endif
int dll_setvbuf(FILE *stream, char *buf, int type, size_t size);
-#if _MSC_VER < 1900
- int dll_filbuf(FILE *fp);
- int dll_flsbuf(int data, FILE*fp);
-#endif
-
#if defined(TARGET_ANDROID)
volatile int * __cdecl dll_errno(void);
#elif defined(TARGET_POSIX)