summaryrefslogtreecommitdiff
path: root/source3/python
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-03-27 05:36:13 +0000
committerTim Potter <tpot@samba.org>2002-03-27 05:36:13 +0000
commit2624a47cb4445ee0172ea0ca481382a520d6a8f4 (patch)
treea09511692a5457840001cb016851ea2c5626f91e /source3/python
parent6deca76e4c5228589ddbf9ad036768ca5423b115 (diff)
downloadsamba-2624a47cb4445ee0172ea0ca481382a520d6a8f4.tar.gz
samba-2624a47cb4445ee0172ea0ca481382a520d6a8f4.tar.bz2
samba-2624a47cb4445ee0172ea0ca481382a520d6a8f4.zip
Converted to #include *.c format.
(This used to be commit 992cbfe98b4131f0aef96da3ddeee00d3d4a1fb1)
Diffstat (limited to 'source3/python')
-rw-r--r--source3/python/py_spoolss_forms.c24
-rwxr-xr-xsource3/python/setup.py.in4
2 files changed, 12 insertions, 16 deletions
diff --git a/source3/python/py_spoolss_forms.c b/source3/python/py_spoolss_forms.c
index 1d3d4ecf19..4f063638d6 100644
--- a/source3/python/py_spoolss_forms.c
+++ b/source3/python/py_spoolss_forms.c
@@ -18,12 +18,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "includes.h"
-#include "Python.h"
-
-#include "python/py_conv.h"
-#include "python/py_spoolss.h"
-
struct pyconv py_FORM[] = {
{ "flags", PY_UINT32, offsetof(FORM, flags) },
{ "width", PY_UINT32, offsetof(FORM, size_x) },
@@ -49,7 +43,7 @@ struct pyconv py_FORM_1[] = {
/* Add a form */
-PyObject *spoolss_addform(PyObject *self, PyObject *args, PyObject *kw)
+static PyObject *spoolss_addform(PyObject *self, PyObject *args, PyObject *kw)
{
spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self;
WERROR werror;
@@ -101,7 +95,7 @@ PyObject *spoolss_addform(PyObject *self, PyObject *args, PyObject *kw)
/* Get form properties */
-PyObject *spoolss_getform(PyObject *self, PyObject *args, PyObject *kw)
+static PyObject *spoolss_getform(PyObject *self, PyObject *args, PyObject *kw)
{
spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self;
WERROR werror;
@@ -114,7 +108,8 @@ PyObject *spoolss_getform(PyObject *self, PyObject *args, PyObject *kw)
/* Parse parameters */
- if (!PyArg_ParseTupleAndKeywords(args, kw, "s|i", kwlist, &form_name, &level))
+ if (!PyArg_ParseTupleAndKeywords(args, kw, "s|i", kwlist,
+ &form_name, &level))
return NULL;
/* Call rpc function */
@@ -147,7 +142,7 @@ PyObject *spoolss_getform(PyObject *self, PyObject *args, PyObject *kw)
/* Set form properties */
-PyObject *spoolss_setform(PyObject *self, PyObject *args, PyObject *kw)
+static PyObject *spoolss_setform(PyObject *self, PyObject *args, PyObject *kw)
{
spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self;
WERROR werror;
@@ -160,7 +155,8 @@ PyObject *spoolss_setform(PyObject *self, PyObject *args, PyObject *kw)
/* Parse parameters */
if (!PyArg_ParseTupleAndKeywords(args, kw, "sO!|i", kwlist,
- &form_name, &PyDict_Type, &py_form, &level))
+ &form_name, &PyDict_Type, &py_form,
+ &level))
return NULL;
/* Call rpc function */
@@ -184,7 +180,8 @@ PyObject *spoolss_setform(PyObject *self, PyObject *args, PyObject *kw)
/* Delete a form */
-PyObject *spoolss_deleteform(PyObject *self, PyObject *args, PyObject *kw)
+static PyObject *spoolss_deleteform(PyObject *self, PyObject *args,
+ PyObject *kw)
{
spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self;
WERROR werror;
@@ -215,7 +212,8 @@ PyObject *spoolss_deleteform(PyObject *self, PyObject *args, PyObject *kw)
/* Enumerate forms */
-PyObject *spoolss_enumforms(PyObject *self, PyObject *args, PyObject *kw)
+static PyObject *spoolss_enumforms(PyObject *self, PyObject *args,
+ PyObject *kw)
{
PyObject *result;
spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self;
diff --git a/source3/python/setup.py.in b/source3/python/setup.py.in
index 671daaf63b..8a78293088 100755
--- a/source3/python/setup.py.in
+++ b/source3/python/setup.py.in
@@ -72,7 +72,7 @@ setup(
# Build info
- include_dirs = [samba_srcdir, samba_srcdir + "include",
+ include_dirs = [samba_srcdir + '.', samba_srcdir + "include",
samba_srcdir + "ubiqx", samba_srcdir + "smbwrapper",
samba_srcdir + "popt", "/usr/kerberos/include",
"/usr/local/include"],
@@ -85,8 +85,6 @@ setup(
Extension(name = "spoolss",
sources = [samba_srcdir + "python/py_spoolss.c",
- samba_srcdir + "python/py_spoolss_forms.c",
- samba_srcdir + "python/py_spoolss_ports.c",
samba_srcdir + "python/py_common.c",
samba_srcdir + "python/py_conv.c"],
libraries = lib_list,