Merge from HEAD:

>FUNCTION_MACRO change broke the Python modules.
>
>Also fix up string pasting (I thought this should only be a warning?)

source/python/setup.py

@@ -179,6 +179,7 @@ setup(
     # tdbpack/unpack extensions.  Does not actually link to any Samba
     # code, although it implements a compatible data format.
     Extension(name = "tdbpack",
-              sources = [os.path.join(samba_srcdir, "python", "py_tdbpack.c")]),
+              sources = [os.path.join(samba_srcdir, "python", "py_tdbpack.c")],
+              extra_compile_args = ["-I include"])
     ],
 )