Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into bpo-9566-x64-comp…
…iler-warnings
  • Loading branch information
segevfiner committed Jul 6, 2017
commit c6d111a1c5386c8814c52f06d25195b5b9dd7910
6 changes: 1 addition & 5 deletions PC/clinic/msvcrtmodule.c.h
Original file line number Diff line number Diff line change
Expand Up @@ -437,10 +437,6 @@ msvcrt_CrtSetReportFile(PyObject *module, PyObject **args, Py_ssize_t nargs)
void *file;
void *_return_value;

if (!_PyArg_NoStackKeywords("CrtSetReportFile", kwnames)) {
goto exit;
}

if (!_PyArg_ParseStack(args, nargs, "i"_Py_PARSE_INTPTR":CrtSetReportFile",
&type, &file)) {
goto exit;
Expand Down Expand Up @@ -573,4 +569,4 @@ msvcrt_SetErrorMode(PyObject *module, PyObject *arg)
#ifndef MSVCRT_SET_ERROR_MODE_METHODDEF
#define MSVCRT_SET_ERROR_MODE_METHODDEF
#endif /* !defined(MSVCRT_SET_ERROR_MODE_METHODDEF) */
/*[clinic end generated code: output=990a62e1a66b7ab5 input=a9049054013a1b77]*/
/*[clinic end generated code: output=e86cf578e7f1ffd2 input=a9049054013a1b77]*/
You are viewing a condensed version of this merge commit. You can view the full changes here.