Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.
/ druntime Public archive

core.stdc.stdio: prepare for MSVCRT 14 (VS 2015) support #971

Closed
kinke wants to merge 3 commits into from
Closed

core.stdc.stdio: prepare for MSVCRT 14 (VS 2015) support #971

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8c9174
core.stdc.stdio: fix fpos_t for MSVCRT
kinke Sep 27, 2014
224226e
core.stdc.stdio: let fputc/fgetc_nolock operate on _iobuf (non-shared…
kinke Sep 27, 2014
e9c2d5c
core.stdc.stdio: prepare transition to MSVCRT 14 (incl. standard-conf…
kinke Sep 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions src/core/stdc/stdio.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ version( CRuntime_DigitalMars )
else version( CRuntime_Microsoft )
{
///
alias int fpos_t; //check this
alias long fpos_t;
Copy link
Contributor Author

@kinke kinke Sep 28, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw this really ought to be checked for the other platforms too. A 32-bit int is highly unlikely.


///
struct _iobuf
Expand Down Expand Up @@ -949,7 +949,17 @@ else version( CRuntime_Microsoft )
///
pure int fileno(FILE* stream) { return stream._file; }
}
///

version( None ) // requires MSVCRT >= 14 (VS 2015)
{
///
int snprintf(char* s, size_t n, in char* fmt, ...);
///
int vsnprintf(char* s, size_t n, in char* format, va_list arg);
}
else
{
///
int _snprintf(char* s, size_t n, in char* fmt, ...);
///
alias _snprintf snprintf;
Expand All @@ -965,12 +975,12 @@ else version( CRuntime_Microsoft )
enum _TWO_DIGIT_EXPONENT = 1;

///
int _filbuf(FILE *fp);
int _filbuf(_iobuf* fp);
///
int _flsbuf(int c, FILE *fp);
int _flsbuf(int c, _iobuf* fp);

///
int _fputc_nolock(int c, FILE *fp)
int _fputc_nolock(int c, _iobuf* fp)
{
fp._cnt = fp._cnt - 1;
if (fp._cnt >= 0)
Expand All @@ -984,7 +994,7 @@ else version( CRuntime_Microsoft )
}

///
int _fgetc_nolock(FILE *fp)
int _fgetc_nolock(_iobuf* fp)
{
fp._cnt = fp._cnt - 1;
if (fp._cnt >= 0)
Expand All @@ -996,6 +1006,7 @@ else version( CRuntime_Microsoft )
else
return _filbuf(fp);
}
}

///
int _lock_file(FILE *fp);
Expand Down