Use python.h from libreplace

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15513

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 9621a3d7a6949aa833425884cd22379387738cfa)

diff --git a/auth/credentials/pycredentials.c b/auth/credentials/pycredentials.c
index bd877941a9a5172031736e1da645b4d80ee88be1..3687050bde96de5d57a20cab72de03128bdbd65f 100644 (file)
--- a/auth/credentials/pycredentials.c
+++ b/auth/credentials/pycredentials.c
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "python/modules.h"

diff --git a/lib/compression/pycompression.c b/lib/compression/pycompression.c
index 3be3620b1cf145c4837abbd3b55a45719d1a4eb4..5c3fd82a00ac54971ea8efef0cccac858c92f8a2 100644 (file)
--- a/lib/compression/pycompression.c
+++ b/lib/compression/pycompression.c
@@ -26,7 +26,7 @@
 
 #include "includes.h"
 #include <talloc.h>
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "lzxpress.h"
 #include "lzxpress_huffman.h"
 

diff --git a/lib/crypto/py_crypto.c b/lib/crypto/py_crypto.c
index 5b3c307057aa40175e5dc39e9ad3e626352450a8..4d89e12376f18abab447d4395b750bb53afb138c 100644 (file)
--- a/lib/crypto/py_crypto.c
+++ b/lib/crypto/py_crypto.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "includes.h"
 #include "python/py3compat.h"
 

diff --git a/lib/ldb-samba/pyldb.c b/lib/ldb-samba/pyldb.c
index 01ed065947a8b5aab9a7d58af038fe49a437609f..2241abc01df2b3255605371f119e55a887a2e5c9 100644 (file)
--- a/lib/ldb-samba/pyldb.c
+++ b/lib/ldb-samba/pyldb.c
@@ -19,7 +19,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include <ldb.h>

diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index 8981e5ea45c3bdd6b21a8ade77aeea8addba1dfa..a0383ab816600d8b8f598627e956ee5fa50988f1 100644 (file)
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -28,7 +28,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "ldb_private.h"
 #include "ldb_handlers.h"
 #include "pyldb.h"

diff --git a/lib/ldb/pyldb_util.c b/lib/ldb/pyldb_util.c
index 665e34426bc553752b377b7333e8b5d2d0a33f09..1256b16ddad0b123336bebb187e395bf8fa885a6 100644 (file)
--- a/lib/ldb/pyldb_util.c
+++ b/lib/ldb/pyldb_util.c
@@ -23,7 +23,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "ldb.h"
 #include "pyldb.h"
 

diff --git a/lib/smbconf/pysmbconf.c b/lib/smbconf/pysmbconf.c
index 20041d3a580d07c3a7fffd657ed40f8dfd18020d..2538127b1baf7a91f33ae64998ebf965068b8a54 100644 (file)
--- a/lib/smbconf/pysmbconf.c
+++ b/lib/smbconf/pysmbconf.c
@@ -18,7 +18,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "includes.h"
 #include "python/py3compat.h"
 

diff --git a/lib/smbconf/pysmbconf.h b/lib/smbconf/pysmbconf.h
index e8c6c9998e317f29ff15dfd3e06d6c0d93238ace..1e57bfb19dd2080a6d9fbdbac6e79c8b70b5299c 100644 (file)
--- a/lib/smbconf/pysmbconf.h
+++ b/lib/smbconf/pysmbconf.h
@@ -21,7 +21,7 @@
 #ifndef _PYSMBCONF_H_
 #define _PYSMBCONF_H_
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "lib/smbconf/smbconf.h"
 
 typedef struct {

diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 9d62eed455e3618f1c495475bd110116f900682e..f6f068108d6c2f86e1e1dc7110c648fee52aa2f9 100644 (file)
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -21,7 +21,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include <talloc.h>
 #include <pytalloc.h>
 #include "pytalloc_private.h"

diff --git a/lib/talloc/pytalloc_util.c b/lib/talloc/pytalloc_util.c
index 064957ffd6f50a594da6f8a2bb579bb3712b03b3..766938a82c83350e7eed13b4415f28a132b3ca6d 100644 (file)
--- a/lib/talloc/pytalloc_util.c
+++ b/lib/talloc/pytalloc_util.c
@@ -21,7 +21,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "replace.h"
 #include <talloc.h>
 #include "pytalloc.h"

diff --git a/lib/talloc/test_pytalloc.c b/lib/talloc/test_pytalloc.c
index aa05d8c342b8b0f1015966e8cb6790b8714d8f57..fb385852a3987ab2ef8a8fdcc36a8f301b31f781 100644 (file)
--- a/lib/talloc/test_pytalloc.c
+++ b/lib/talloc/test_pytalloc.c
@@ -26,7 +26,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include <talloc.h>
 #include <pytalloc.h>
 

diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c
index ed22803328c2378c26f3027adb10468f3f925edc..4d75d7a9041f1f9d6a6e958bc4b2903a2a02dee0 100644 (file)
--- a/lib/tdb/pytdb.c
+++ b/lib/tdb/pytdb.c
@@ -24,7 +24,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "replace.h"
 #include "system/filesys.h"
 

diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
index aa2331c1d6c2249599df66982534502ad00d4e19..bbe29f6c693ba2295e3b3f2ab0e65cd0357e56cf 100644 (file)
--- a/lib/tevent/pytevent.c
+++ b/lib/tevent/pytevent.c
@@ -22,7 +22,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "replace.h"
 #include <tevent.h>
 

diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c
index 0908a6bce3c60220aece09fbb1512b35fe0fb19a..e0a72fa845157b7dbc9da8db47c633586780afbd 100644 (file)
--- a/libcli/nbt/pynbt.c
+++ b/libcli/nbt/pynbt.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "includes.h"
 #include "python/py3compat.h"
 #include "libcli/util/pyerrors.h"

diff --git a/libcli/security/pysecurity.c b/libcli/security/pysecurity.c
index 807304852426938c8c9e1acd572adb160744195c..c7eaa91a71b47efd548ba9dd2f6dc8a7a7920ce0 100644 (file)
--- a/libcli/security/pysecurity.c
+++ b/libcli/security/pysecurity.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "python/modules.h"

diff --git a/libcli/smb/py_reparse_symlink.c b/libcli/smb/py_reparse_symlink.c
index 57dc6032f99bca8a95cdba456b11e7a5392248fc..470aab8d679dab4e47946e49a07a8db8c61675dc 100644 (file)
--- a/libcli/smb/py_reparse_symlink.c
+++ b/libcli/smb/py_reparse_symlink.c
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "replace.h"
 #include "python/modules.h"
 #include "python/py3compat.h"

diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c
index bf63a60522fc2ae8e434dada863c549add16b92c..adbd5b4688dd3cb05f5c46433cb8b3201f7c7eb2 100644 (file)
--- a/libgpo/pygpo.c
+++ b/libgpo/pygpo.c
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "includes.h"
 #include "version.h"
 #include "param/pyparam.h"

diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 6eb59a0557e69927d7ab1c6caaec11e9c2b533aa..7867eabad9264c0afe1b5d611c2a28ac7e754cfb 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -2293,7 +2293,7 @@ sub Parse($$$$$)
     $self->pidl_hdr("
 /* Python wrapper functions auto-generated by pidl */
 #define PY_SSIZE_T_CLEAN 1 /* We use Py_ssize_t for PyArg_ParseTupleAndKeywords */
-#include <Python.h>
+#include \"lib/replace/system/python.h\"
 #include \"python/py3compat.h\"
 #include \"includes.h\"
 #include \"python/modules.h\"

diff --git a/python/modules.c b/python/modules.c
index ca563ff07d2db1ddf6417e770b1c494243fce26c..577eb552750e0f14781354a1b6942015d1a78e09 100644 (file)
--- a/python/modules.c
+++ b/python/modules.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "py3compat.h"
 #include "includes.h"
 #include "python/modules.h"

diff --git a/python/py3compat.h b/python/py3compat.h
index 011082147831b8b9d74f4bcc280221cabae2a8fb..bfee82f92b37f25680ea74a6f0ccdd4cdc82b400 100644 (file)
--- a/python/py3compat.h
+++ b/python/py3compat.h
@@ -19,7 +19,7 @@
 
 #ifndef _SAMBA_PY3COMPAT_H_
 #define _SAMBA_PY3COMPAT_H_
-#include <Python.h>
+#include "lib/replace/system/python.h"
 
 /* Quick docs:
  * Syntax for module initialization is as in Python 3, except the entrypoint

diff --git a/python/pyglue.c b/python/pyglue.c
index 901a9a37be58cd673f61cc25c8f6cfbf224d5cb2..b35b2d211048be6d8dfa6d6a6aeb36d0c5a80a66 100644 (file)
--- a/python/pyglue.c
+++ b/python/pyglue.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "python/modules.h"

diff --git a/source3/lib/smbconf/pys3smbconf.c b/source3/lib/smbconf/pys3smbconf.c
index 07e75f6b5799cc321b9ab10ede073bf41d51eaf8..09d4881a9b0b9f59951b62c7d86194dc099a9d8b 100644 (file)
--- a/source3/lib/smbconf/pys3smbconf.c
+++ b/source3/lib/smbconf/pys3smbconf.c
@@ -18,7 +18,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "includes.h"
 #include "python/py3compat.h"
 

diff --git a/source3/libsmb/pylibsmb.c b/source3/libsmb/pylibsmb.c
index 6199f7b32dc33743d536b4ea794674680ab51820..f06f6640640ce6ff5c34a2bf7598bca12d7d0969 100644 (file)
--- a/source3/libsmb/pylibsmb.c
+++ b/source3/libsmb/pylibsmb.c
@@ -45,7 +45,7 @@ c = libsmb.Conn("127.0.0.1",
 -------------------------
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "includes.h"
 #include "python/py3compat.h"
 #include "python/modules.h"

diff --git a/source3/param/pyparam.c b/source3/param/pyparam.c
index 749cfe308f4d845da7ea7ee9a2531010d22b746e..531bc2a687f1778f4ea3c71ee948707b48cb48ae 100644 (file)
--- a/source3/param/pyparam.c
+++ b/source3/param/pyparam.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "includes.h"
 #include "python/py3compat.h"
 #include "param/param.h"

diff --git a/source3/param/pyparam_util.c b/source3/param/pyparam_util.c
index 67ab4945d6ab78a7aa0dcb195bcba9d3e4de1e93..bfd8d05a2926f24fe305ce6f39fee97916927f5c 100644 (file)
--- a/source3/param/pyparam_util.c
+++ b/source3/param/pyparam_util.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "includes.h"
 #include "param/param.h"
 #include "param/pyparam.h"

diff --git a/source3/passdb/py_passdb.c b/source3/passdb/py_passdb.c
index 7982654b6bcce047d305c784e410d07212858f11..48497a34552ed9457de19fa73f427365b8fbe3af 100644 (file)
--- a/source3/passdb/py_passdb.c
+++ b/source3/passdb/py_passdb.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include <pytalloc.h>
 #include "includes.h"
 #include "python/py3compat.h"

diff --git a/source3/rpc_client/py_mdscli.c b/source3/rpc_client/py_mdscli.c
index 2594200ecfefb2966c3cf3b0f93235f1c2454107..ccb0342b86b630804fe5516a97927d8d5ad2e1ab 100644 (file)
--- a/source3/rpc_client/py_mdscli.c
+++ b/source3/rpc_client/py_mdscli.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include <pytalloc.h>
 #include "includes.h"
 #include "python/py3compat.h"

diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysmbd.c
index f9f5384cfb3a8ffb6256ecbf4ddceb19fdc63f15..e1f889dad30b8d7f65e810a15e96a3c15ff15232 100644 (file)
--- a/source3/smbd/pysmbd.c
+++ b/source3/smbd/pysmbd.c
@@ -23,7 +23,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "includes.h"
 #include "python/py3compat.h"
 #include "python/modules.h"

diff --git a/source3/utils/py_net.c b/source3/utils/py_net.c
index 6f20fdb08904f2a282f10fbcd0333865eb1c52aa..181b8f2d1cae7300e233ca3d23a62c79881fb226 100644 (file)
--- a/source3/utils/py_net.c
+++ b/source3/utils/py_net.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "includes.h"
 #include <pytalloc.h>
 #include "python/modules.h"

diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index dd63fa58348fa0807615fea4b7ccda6eb9ccf5d3..97ced8f11c4d34db604cf4b14c46b2ae3e286f0e 100644 (file)
--- a/source4/auth/gensec/pygensec.c
+++ b/source4/auth/gensec/pygensec.c
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "python/modules.h"

diff --git a/source4/auth/pyauth.c b/source4/auth/pyauth.c
index b41108b70726eb76599729dd9ca5bc0eb8f68a2e..498b52e2becd3faad6baa1ff1d07816b61718980 100644 (file)
--- a/source4/auth/pyauth.c
+++ b/source4/auth/pyauth.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "python/modules.h"

diff --git a/source4/dns_server/pydns.c b/source4/dns_server/pydns.c
index 7b83d7c49a11aa775b22a91a9936e2dc8b364a50..6e99ebd6479be763de813f45016d78260eec132c 100644 (file)
--- a/source4/dns_server/pydns.c
+++ b/source4/dns_server/pydns.c
@@ -19,7 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "python/modules.h"

diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c
index 6bf304f4f91ea5308def577a4ee5f8e94c2202f6..aac311a84ff98872af48087293ce281d61bebf5f 100644 (file)
--- a/source4/dsdb/pydsdb.c
+++ b/source4/dsdb/pydsdb.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include <ldb.h>

diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index 31755ea591a3e770c3d83225c19296deb515cb74..b88727c6bd20063840b65da92060167e49fca35d 100644 (file)
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -19,7 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "python/modules.h"

diff --git a/source4/lib/policy/pypolicy.c b/source4/lib/policy/pypolicy.c
index f40d811a50fa264abccbfe99b303cc1e0843add8..f85ea8532bc442bedb37af466113dcaf532dfb43 100644 (file)
--- a/source4/lib/policy/pypolicy.c
+++ b/source4/lib/policy/pypolicy.c
@@ -17,7 +17,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "includes.h"
 #include "python/py3compat.h"
 #include "policy.h"

diff --git a/source4/lib/registry/pyregistry.c b/source4/lib/registry/pyregistry.c
index f4201c3ca9e2fef62a178f957f40986d93ac34a4..de40d2a666947508497f09fdbfe43dc833152022 100644 (file)
--- a/source4/lib/registry/pyregistry.c
+++ b/source4/lib/registry/pyregistry.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "python/modules.h"

diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index 42eee509c6b6acf5d22f178178fe3fa9a4cb391b..071ad0481ecd47cfa6eaf8ab9567ca6e58434965 100644 (file)
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -19,7 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "python/modules.h"

diff --git a/source4/libnet/py_net_dckeytab.c b/source4/libnet/py_net_dckeytab.c
index ad65c7d46a64da84ea31225eed2d18bb9c5e02c3..0c3df8958ab67a0d57d9864b6609f285d0579526 100644 (file)
--- a/source4/libnet/py_net_dckeytab.c
+++ b/source4/libnet/py_net_dckeytab.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "includes.h"
 #include "python/py3compat.h"
 #include "python/modules.h"

diff --git a/source4/librpc/ndr/py_auth.c b/source4/librpc/ndr/py_auth.c
index d34a852c06ddea4cddd33e1cf389a580ad9926b9..8d233b3112c74a5c20a50537571820d3af7afb4b 100644 (file)
--- a/source4/librpc/ndr/py_auth.c
+++ b/source4/librpc/ndr/py_auth.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "includes.h"
 #include "libcli/util/pyerrors.h"
 #include "pyauth.h"

diff --git a/source4/librpc/ndr/py_lsa.c b/source4/librpc/ndr/py_lsa.c
index a59dcbf970ccecb50d0adef4894897f14829b843..c5e221fbaa0e626ba5eae4e529e27ec3ce4f0728 100644 (file)
--- a/source4/librpc/ndr/py_lsa.c
+++ b/source4/librpc/ndr/py_lsa.c
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "librpc/gen_ndr/lsa.h"
 
 static PyObject *py_lsa_String_str(PyObject *py_self)

diff --git a/source4/librpc/ndr/py_misc.c b/source4/librpc/ndr/py_misc.c
index 9910087568928192f6c4b8a295c0240a48278310..16e2960a1c3ea0b6bc31d521986e34154315c14a 100644 (file)
--- a/source4/librpc/ndr/py_misc.c
+++ b/source4/librpc/ndr/py_misc.c
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "librpc/gen_ndr/misc.h"
 

diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c
index 217b7dc19d1403a7fc839730cf455030884aa805..772f8ac18374a153f5c4c860522a8e80c59c7bb8 100644 (file)
--- a/source4/librpc/ndr/py_security.c
+++ b/source4/librpc/ndr/py_security.c
@@ -1,23 +1,23 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Samba utility functions
 
    Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008-2010
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "py3compat.h"
 #include "libcli/security/sddl.h"
 #include "libcli/security/security.h"
@@ -31,11 +31,11 @@ static void PyType_AddMethods(PyTypeObject *type, PyMethodDef *methods)
        dict = type->tp_dict;
        for (i = 0; methods[i].ml_name; i++) {
                PyObject *descr;
-               if (methods[i].ml_flags & METH_CLASS) 
+               if (methods[i].ml_flags & METH_CLASS)
                        descr = PyCFunction_New(&methods[i], (PyObject *)type);
-               else 
+               else
                        descr = PyDescr_NewMethod(type, &methods[i]);
-               PyDict_SetItemString(dict, methods[i].ml_name, 
+               PyDict_SetItemString(dict, methods[i].ml_name,
                                     descr);
                Py_CLEAR(descr);
        }
@@ -414,7 +414,7 @@ static PyObject *py_token_is_anonymous(PyObject *self,
        PyObject *Py_UNUSED(ignored))
 {
        struct security_token *token = pytalloc_get_ptr(self);
-       
+
        return PyBool_FromLong(security_token_is_anonymous(token));
 }
 
@@ -422,7 +422,7 @@ static PyObject *py_token_is_system(PyObject *self,
        PyObject *Py_UNUSED(ignored))
 {
        struct security_token *token = pytalloc_get_ptr(self);
-       
+
        return PyBool_FromLong(security_token_is_system(token));
 }
 
@@ -430,7 +430,7 @@ static PyObject *py_token_has_builtin_administrators(PyObject *self,
        PyObject *Py_UNUSED(ignored))
 {
        struct security_token *token = pytalloc_get_ptr(self);
-       
+
        return PyBool_FromLong(security_token_has_builtin_administrators(token));
 }
 
@@ -438,7 +438,7 @@ static PyObject *py_token_has_nt_authenticated_users(PyObject *self,
        PyObject *Py_UNUSED(ignored))
 {
        struct security_token *token = pytalloc_get_ptr(self);
-       
+
        return PyBool_FromLong(security_token_has_nt_authenticated_users(token));
 }
 
@@ -468,7 +468,7 @@ static PyObject *py_token_set_privilege(PyObject *self, PyObject *args)
 static PyObject *py_token_new(PyTypeObject *self, PyObject *args, PyObject *kwargs)
 {
        return pytalloc_steal(self, security_token_initialise(NULL));
-}      
+}
 
 static PyMethodDef py_token_extra_methods[] = {
        { "is_sid", (PyCFunction)py_token_is_sid, METH_VARARGS,

diff --git a/source4/librpc/ndr/py_xattr.c b/source4/librpc/ndr/py_xattr.c
index 221b9771e0d391340d105ce91ee252a4e6fabb36..523c1ab4a193a44ebaa70bb3f75570353761707b 100644 (file)
--- a/source4/librpc/ndr/py_xattr.c
+++ b/source4/librpc/ndr/py_xattr.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 
 static void PyType_AddMethods(PyTypeObject *type, PyMethodDef *methods)
 {

diff --git a/source4/librpc/rpc/pyrpc.c b/source4/librpc/rpc/pyrpc.c
index 61b3c6357b0eac161491f1b9053e48bd1bed07f9..3f1a8679d3e9f8058c7c4e8a7a6e99a29bd474d9 100644 (file)
--- a/source4/librpc/rpc/pyrpc.c
+++ b/source4/librpc/rpc/pyrpc.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "python/modules.h"

diff --git a/source4/librpc/rpc/pyrpc_util.c b/source4/librpc/rpc/pyrpc_util.c
index 0d6a16518f1f375bcc13d5f3a18087274ab8b4e7..6a9c8c77437eac16ac4fd32525811c124ba084fa 100644 (file)
--- a/source4/librpc/rpc/pyrpc_util.c
+++ b/source4/librpc/rpc/pyrpc_util.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "python/modules.h"

diff --git a/source4/ntvfs/posix/python/pyposix_eadb.c b/source4/ntvfs/posix/python/pyposix_eadb.c
index abf397f990c2a61d1a38bd4d2f5f3a19941d1028..aca92e71b7e4b85d8ec0db5b243e42bbd9285150 100644 (file)
--- a/source4/ntvfs/posix/python/pyposix_eadb.c
+++ b/source4/ntvfs/posix/python/pyposix_eadb.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "system/filesys.h"

diff --git a/source4/ntvfs/posix/python/pyxattr_native.c b/source4/ntvfs/posix/python/pyxattr_native.c
index 7511e5c02bfd2087e569783c04aac0c24e62786e..6b237b000841c60926779787f70b30f4c51d3bb3 100644 (file)
--- a/source4/ntvfs/posix/python/pyxattr_native.c
+++ b/source4/ntvfs/posix/python/pyxattr_native.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "librpc/ndr/libndr.h"

diff --git a/source4/ntvfs/posix/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c
index 425fd868ca02f73a77905ddc9f864860f99dde46..5f07809834c76eee1993a6c07d432f0812e209ba 100644 (file)
--- a/source4/ntvfs/posix/python/pyxattr_tdb.c
+++ b/source4/ntvfs/posix/python/pyxattr_tdb.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "system/filesys.h"

diff --git a/source4/param/provision.c b/source4/param/provision.c
index d6d120647e6a5c62b38f33e521513c71c6f0d145..f5caf66b3c63e7a6548dca1c9ffbce3b648b9bbb 100644 (file)
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include <ldb.h>
 #include <pyldb.h>

diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index c91b7382ef4f79c934f15a2d7d16cd5296ab1423..2bd7b91bd50ed84a0f13aecb1f3330f36ad48ee9 100644 (file)
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "python/py3compat.h"
 #include "includes.h"
 #include "param/param.h"

diff --git a/source4/param/pyparam_util.c b/source4/param/pyparam_util.c
index 9b9dcd22c909fc6b2f67f0fa71630ac94768bbea..bb7ffda1cc239ef1f3fcce2b6728a8a3f5405623 100644 (file)
--- a/source4/param/pyparam_util.c
+++ b/source4/param/pyparam_util.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <Python.h>
+#include "lib/replace/system/python.h"
 #include "py3compat.h"
 #include "includes.h"
 #include "param/param.h"

diff --git a/source4/scripting/bin/gen_ntstatus.py b/source4/scripting/bin/gen_ntstatus.py
index bf0f01640b07ba5fb2272ac01711d0914ff92cb1..e4b0ad8e42887ff7a7be659afc0650abc081795e 100755 (executable)
--- a/source4/scripting/bin/gen_ntstatus.py
+++ b/source4/scripting/bin/gen_ntstatus.py
@@ -69,7 +69,7 @@ def generatePythonFile(out_file, errors):
     out_file.write(" * New descriptions for existing errors generated from\n")
     out_file.write(" * [MS-ERREF] http://msdn.microsoft.com/en-us/library/cc704588.aspx\n")
     out_file.write(" */\n")
-    out_file.write("#include <Python.h>\n")
+    out_file.write("#include \"lib/replace/system/python.h\"\n")
     out_file.write("#include \"python/py3compat.h\"\n")
     out_file.write("#include \"includes.h\"\n\n")
     # This is needed to avoid a missing prototype error from the C

diff --git a/source4/scripting/bin/gen_werror.py b/source4/scripting/bin/gen_werror.py
index 445d7994d8bfe0a4db57a7bc8fca72339319e1b4..c0087d3c3f2b0d1436de8e0ab7d75d95491ab799 100755 (executable)
--- a/source4/scripting/bin/gen_werror.py
+++ b/source4/scripting/bin/gen_werror.py
@@ -67,7 +67,7 @@ def generatePythonFile(out_file, errors):
     out_file.write(" * Errors generated from\n")
     out_file.write(" * [MS-ERREF] https://msdn.microsoft.com/en-us/library/cc231199.aspx\n")
     out_file.write(" */\n")
-    out_file.write("#include <Python.h>\n")
+    out_file.write("#include \"lib/replace/system/python.h\"\n")
     out_file.write("#include \"python/py3compat.h\"\n")
     out_file.write("#include \"includes.h\"\n\n")
     # This is needed to avoid a missing prototype error from the C