diff options
| -rw-r--r-- | Include/internal/pygetopt.h | 19 | ||||
| -rw-r--r-- | Include/pygetopt.h | 28 | ||||
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/C API/2017-12-12-23-09-46.bpo-32264.ahRlOI.rst | 1 | ||||
| -rw-r--r-- | Modules/main.c | 3 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 2 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj.filters | 2 | ||||
| -rw-r--r-- | Python/getopt.c | 2 |
8 files changed, 25 insertions, 34 deletions
diff --git a/Include/internal/pygetopt.h b/Include/internal/pygetopt.h new file mode 100644 index 0000000..df6f183 --- /dev/null +++ b/Include/internal/pygetopt.h @@ -0,0 +1,19 @@ +#ifndef Py_INTERNAL_PYGETOPT_H +#define Py_INTERNAL_PYGETOPT_H + +int _PyOS_opterr; +int _PyOS_optind; +wchar_t *_PyOS_optarg; + +void _PyOS_ResetGetOpt(void); + +typedef struct { + const wchar_t *name; + int has_arg; + int val; +} _PyOS_LongOption; + +int _PyOS_GetOpt(int argc, wchar_t **argv, wchar_t *optstring, + const _PyOS_LongOption *longopts, int *longindex); + +#endif /* !Py_INTERNAL_PYGETOPT_H */ diff --git a/Include/pygetopt.h b/Include/pygetopt.h deleted file mode 100644 index 3e3fe36..0000000 --- a/Include/pygetopt.h +++ /dev/null @@ -1,28 +0,0 @@ - -#ifndef Py_PYGETOPT_H -#define Py_PYGETOPT_H -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef Py_LIMITED_API -PyAPI_DATA(int) _PyOS_opterr; -PyAPI_DATA(int) _PyOS_optind; -PyAPI_DATA(wchar_t *) _PyOS_optarg; - -PyAPI_FUNC(void) _PyOS_ResetGetOpt(void); - -typedef struct { - const wchar_t *name; - int has_arg; - int val; -} _PyOS_LongOption; - -PyAPI_FUNC(int) _PyOS_GetOpt(int argc, wchar_t **argv, wchar_t *optstring, - const _PyOS_LongOption *longopts, int *longindex); -#endif /* !Py_LIMITED_API */ - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PYGETOPT_H */ diff --git a/Makefile.pre.in b/Makefile.pre.in index fcce62f..4fe9aff 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -987,7 +987,6 @@ PYTHON_HEADERS= \ $(srcdir)/Include/pyhash.h \ $(srcdir)/Include/pylifecycle.h \ $(srcdir)/Include/pymath.h \ - $(srcdir)/Include/pygetopt.h \ $(srcdir)/Include/pymacro.h \ $(srcdir)/Include/pymem.h \ $(srcdir)/Include/pyport.h \ @@ -1017,6 +1016,7 @@ PYTHON_HEADERS= \ $(srcdir)/Include/internal/ceval.h \ $(srcdir)/Include/internal/gil.h \ $(srcdir)/Include/internal/mem.h \ + $(srcdir)/Include/internal/pygetopt.h \ $(srcdir)/Include/internal/pystate.h \ $(srcdir)/Include/internal/warnings.h \ $(DTRACE_HEADERS) diff --git a/Misc/NEWS.d/next/C API/2017-12-12-23-09-46.bpo-32264.ahRlOI.rst b/Misc/NEWS.d/next/C API/2017-12-12-23-09-46.bpo-32264.ahRlOI.rst new file mode 100644 index 0000000..5033d61 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2017-12-12-23-09-46.bpo-32264.ahRlOI.rst @@ -0,0 +1 @@ +Moved the pygetopt.h header into internal/, since it has no public APIs. diff --git a/Modules/main.c b/Modules/main.c index 339a0f5..6b602cf 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -3,6 +3,7 @@ #include "Python.h" #include "osdefs.h" #include "internal/import.h" +#include "internal/pygetopt.h" #include "internal/pystate.h" #include <locale.h> @@ -27,8 +28,6 @@ #define PYTHONHOMEHELP "<prefix>/lib/pythonX.X" #endif -#include "pygetopt.h" - #define COPYRIGHT \ "Type \"help\", \"copyright\", \"credits\" or \"license\" " \ "for more information." diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 1dca3cc..25651d0 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -150,7 +150,7 @@ <ClInclude Include="..\Include\pyerrors.h" /> <ClInclude Include="..\Include\pyexpat.h" /> <ClInclude Include="..\Include\pyfpe.h" /> - <ClInclude Include="..\Include\pygetopt.h" /> + <ClInclude Include="..\Include\internal\pygetopt.h" /> <ClInclude Include="..\Include\pylifecycle.h" /> <ClInclude Include="..\Include\pymath.h" /> <ClInclude Include="..\Include\pytime.h" /> diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index 969ba08..42b2fc3 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -234,7 +234,7 @@ <ClInclude Include="..\Include\pyfpe.h"> <Filter>Include</Filter> </ClInclude> - <ClInclude Include="..\Include\pygetopt.h"> + <ClInclude Include="..\Include\internal\pygetopt.h"> <Filter>Include</Filter> </ClInclude> <ClInclude Include="..\Include\pylifecycle.h"> diff --git a/Python/getopt.c b/Python/getopt.c index de32ad4..e8d7e52 100644 --- a/Python/getopt.c +++ b/Python/getopt.c @@ -31,7 +31,7 @@ #include <stdio.h> #include <string.h> #include <wchar.h> -#include <pygetopt.h> +#include "internal/pygetopt.h" #ifdef __cplusplus extern "C" { |