Kaynağa Gözat

fix posix_close name collision in 2.4 builds

Ported from https://bugs.python.org/issue20594
pull/1321/head
Alexander Dormann 7 yıl önce
ebeveyn
işleme
40a88f050b
7 değiştirilmiş dosya ile 140 ekleme ve 0 silme
  1. +20
    -0
      plugins/python-build/share/python-build/patches/2.4.0/Python-2.4/002_patch-posixmodule.diff
  2. +20
    -0
      plugins/python-build/share/python-build/patches/2.4.1/Python-2.4.1/002_patch-posixmodule.diff
  3. +20
    -0
      plugins/python-build/share/python-build/patches/2.4.2/Python-2.4.2/002_patch-posixmodule.diff
  4. +20
    -0
      plugins/python-build/share/python-build/patches/2.4.3/Python-2.4.3/002_patch-posixmodule.diff
  5. +20
    -0
      plugins/python-build/share/python-build/patches/2.4.4/Python-2.4.4/001_patch-posixmodule.diff
  6. +20
    -0
      plugins/python-build/share/python-build/patches/2.4.5/Python-2.4.5/001_patch-posixmodule.diff
  7. +20
    -0
      plugins/python-build/share/python-build/patches/2.4.6/Python-2.4.6/001_patch-posixmodule.diff

+ 20
- 0
plugins/python-build/share/python-build/patches/2.4.0/Python-2.4/002_patch-posixmodule.diff Dosyayı Görüntüle

@ -0,0 +1,20 @@
--- Modules/posixmodule.c.orig 2019-04-04 20:27:41.000000000 +0200
+++ Modules/posixmodule.c 2019-04-04 20:28:07.000000000 +0200
@@ -5300,7 +5300,7 @@
Close a file descriptor (for low level IO).");
static PyObject *
-posix_close(PyObject *self, PyObject *args)
+posix_closex(PyObject *self, PyObject *args)
{
int fd, res;
if (!PyArg_ParseTuple(args, "i:close", &fd))
@@ -7554,7 +7554,7 @@
{"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__},
#endif /* HAVE_TCSETPGRP */
{"open", posix_open, METH_VARARGS, posix_open__doc__},
- {"close", posix_close, METH_VARARGS, posix_close__doc__},
+ {"close", posix_closex, METH_VARARGS, posix_close__doc__},
{"dup", posix_dup, METH_VARARGS, posix_dup__doc__},
{"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__},
{"lseek", posix_lseek, METH_VARARGS, posix_lseek__doc__},

+ 20
- 0
plugins/python-build/share/python-build/patches/2.4.1/Python-2.4.1/002_patch-posixmodule.diff Dosyayı Görüntüle

@ -0,0 +1,20 @@
--- Modules/posixmodule.c.orig 2019-04-04 20:27:41.000000000 +0200
+++ Modules/posixmodule.c 2019-04-04 20:28:07.000000000 +0200
@@ -5300,7 +5300,7 @@
Close a file descriptor (for low level IO).");
static PyObject *
-posix_close(PyObject *self, PyObject *args)
+posix_closex(PyObject *self, PyObject *args)
{
int fd, res;
if (!PyArg_ParseTuple(args, "i:close", &fd))
@@ -7554,7 +7554,7 @@
{"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__},
#endif /* HAVE_TCSETPGRP */
{"open", posix_open, METH_VARARGS, posix_open__doc__},
- {"close", posix_close, METH_VARARGS, posix_close__doc__},
+ {"close", posix_closex, METH_VARARGS, posix_close__doc__},
{"dup", posix_dup, METH_VARARGS, posix_dup__doc__},
{"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__},
{"lseek", posix_lseek, METH_VARARGS, posix_lseek__doc__},

+ 20
- 0
plugins/python-build/share/python-build/patches/2.4.2/Python-2.4.2/002_patch-posixmodule.diff Dosyayı Görüntüle

@ -0,0 +1,20 @@
--- Modules/posixmodule.c.orig 2019-04-04 20:27:41.000000000 +0200
+++ Modules/posixmodule.c 2019-04-04 20:28:07.000000000 +0200
@@ -5300,7 +5300,7 @@
Close a file descriptor (for low level IO).");
static PyObject *
-posix_close(PyObject *self, PyObject *args)
+posix_closex(PyObject *self, PyObject *args)
{
int fd, res;
if (!PyArg_ParseTuple(args, "i:close", &fd))
@@ -7554,7 +7554,7 @@
{"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__},
#endif /* HAVE_TCSETPGRP */
{"open", posix_open, METH_VARARGS, posix_open__doc__},
- {"close", posix_close, METH_VARARGS, posix_close__doc__},
+ {"close", posix_closex, METH_VARARGS, posix_close__doc__},
{"dup", posix_dup, METH_VARARGS, posix_dup__doc__},
{"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__},
{"lseek", posix_lseek, METH_VARARGS, posix_lseek__doc__},

+ 20
- 0
plugins/python-build/share/python-build/patches/2.4.3/Python-2.4.3/002_patch-posixmodule.diff Dosyayı Görüntüle

@ -0,0 +1,20 @@
--- Modules/posixmodule.c.orig 2019-04-04 20:27:41.000000000 +0200
+++ Modules/posixmodule.c 2019-04-04 20:28:07.000000000 +0200
@@ -5300,7 +5300,7 @@
Close a file descriptor (for low level IO).");
static PyObject *
-posix_close(PyObject *self, PyObject *args)
+posix_closex(PyObject *self, PyObject *args)
{
int fd, res;
if (!PyArg_ParseTuple(args, "i:close", &fd))
@@ -7554,7 +7554,7 @@
{"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__},
#endif /* HAVE_TCSETPGRP */
{"open", posix_open, METH_VARARGS, posix_open__doc__},
- {"close", posix_close, METH_VARARGS, posix_close__doc__},
+ {"close", posix_closex, METH_VARARGS, posix_close__doc__},
{"dup", posix_dup, METH_VARARGS, posix_dup__doc__},
{"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__},
{"lseek", posix_lseek, METH_VARARGS, posix_lseek__doc__},

+ 20
- 0
plugins/python-build/share/python-build/patches/2.4.4/Python-2.4.4/001_patch-posixmodule.diff Dosyayı Görüntüle

@ -0,0 +1,20 @@
--- Modules/posixmodule.c.orig 2019-04-04 20:27:41.000000000 +0200
+++ Modules/posixmodule.c 2019-04-04 20:28:07.000000000 +0200
@@ -5300,7 +5300,7 @@
Close a file descriptor (for low level IO).");
static PyObject *
-posix_close(PyObject *self, PyObject *args)
+posix_closex(PyObject *self, PyObject *args)
{
int fd, res;
if (!PyArg_ParseTuple(args, "i:close", &fd))
@@ -7554,7 +7554,7 @@
{"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__},
#endif /* HAVE_TCSETPGRP */
{"open", posix_open, METH_VARARGS, posix_open__doc__},
- {"close", posix_close, METH_VARARGS, posix_close__doc__},
+ {"close", posix_closex, METH_VARARGS, posix_close__doc__},
{"dup", posix_dup, METH_VARARGS, posix_dup__doc__},
{"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__},
{"lseek", posix_lseek, METH_VARARGS, posix_lseek__doc__},

+ 20
- 0
plugins/python-build/share/python-build/patches/2.4.5/Python-2.4.5/001_patch-posixmodule.diff Dosyayı Görüntüle

@ -0,0 +1,20 @@
--- Modules/posixmodule.c.orig 2019-04-04 20:27:41.000000000 +0200
+++ Modules/posixmodule.c 2019-04-04 20:28:07.000000000 +0200
@@ -5300,7 +5300,7 @@
Close a file descriptor (for low level IO).");
static PyObject *
-posix_close(PyObject *self, PyObject *args)
+posix_closex(PyObject *self, PyObject *args)
{
int fd, res;
if (!PyArg_ParseTuple(args, "i:close", &fd))
@@ -7554,7 +7554,7 @@
{"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__},
#endif /* HAVE_TCSETPGRP */
{"open", posix_open, METH_VARARGS, posix_open__doc__},
- {"close", posix_close, METH_VARARGS, posix_close__doc__},
+ {"close", posix_closex, METH_VARARGS, posix_close__doc__},
{"dup", posix_dup, METH_VARARGS, posix_dup__doc__},
{"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__},
{"lseek", posix_lseek, METH_VARARGS, posix_lseek__doc__},

+ 20
- 0
plugins/python-build/share/python-build/patches/2.4.6/Python-2.4.6/001_patch-posixmodule.diff Dosyayı Görüntüle

@ -0,0 +1,20 @@
--- Modules/posixmodule.c.orig 2019-04-04 20:27:41.000000000 +0200
+++ Modules/posixmodule.c 2019-04-04 20:28:07.000000000 +0200
@@ -5300,7 +5300,7 @@
Close a file descriptor (for low level IO).");
static PyObject *
-posix_close(PyObject *self, PyObject *args)
+posix_closex(PyObject *self, PyObject *args)
{
int fd, res;
if (!PyArg_ParseTuple(args, "i:close", &fd))
@@ -7554,7 +7554,7 @@
{"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__},
#endif /* HAVE_TCSETPGRP */
{"open", posix_open, METH_VARARGS, posix_open__doc__},
- {"close", posix_close, METH_VARARGS, posix_close__doc__},
+ {"close", posix_closex, METH_VARARGS, posix_close__doc__},
{"dup", posix_dup, METH_VARARGS, posix_dup__doc__},
{"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__},
{"lseek", posix_lseek, METH_VARARGS, posix_lseek__doc__},

Yükleniyor…
İptal
Kaydet