summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Müller <lmuelle@samba.org>2005-07-13 16:47:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:00:05 -0500
commitcd2c467cc46db1958aba7660f0ef7fd8af14bd63 (patch)
tree4b654ec2b6da94622fef0003b658737e4a27e039
parent25fa0e82c1ee1a568ffe201fbabb95cc809162b6 (diff)
downloadsamba-cd2c467cc46db1958aba7660f0ef7fd8af14bd63.tar.gz
samba-cd2c467cc46db1958aba7660f0ef7fd8af14bd63.tar.xz
samba-cd2c467cc46db1958aba7660f0ef7fd8af14bd63.zip
r8431: Ensure to use dev_private and not private after Jeremy's CPP reserved
names rename. Jerry: I'm not sure if we have to use the string 'dev_private' instead of 'private' as second arg to PyDict_SetItemString().
-rw-r--r--source/python/py_spoolss_printers_conv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/python/py_spoolss_printers_conv.c b/source/python/py_spoolss_printers_conv.c
index e31babb0012..4ab030d9619 100644
--- a/source/python/py_spoolss_printers_conv.c
+++ b/source/python/py_spoolss_printers_conv.c
@@ -154,7 +154,7 @@ BOOL py_from_DEVICEMODE(PyObject **dict, DEVICEMODE *devmode)
PyDict_SetItemString(*dict, "private",
PyString_FromStringAndSize(
- devmode->private, devmode->driverextra));
+ devmode->dev_private, devmode->driverextra));
return True;
}
@@ -170,7 +170,7 @@ BOOL py_to_DEVICEMODE(DEVICEMODE *devmode, PyObject *dict)
if (!PyString_Check(obj))
goto done;
- devmode->private = PyString_AsString(obj);
+ devmode->dev_private = PyString_AsString(obj);
devmode->driverextra = PyString_Size(obj);
PyDict_DelItemString(dict_copy, "private");