diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-04-17 09:36:09 +0200 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-04-17 09:36:09 +0200 |
| commit | 30b9c37420100c98df1a538673d508e46517accf (patch) | |
| tree | 33ccf13461371c1281a0fc707e66a814a3bc88e9 /source4/scripting/python/uuidmodule.c | |
| parent | 4bbaf36f6fd85c9d07a16320ad58d7a6ad43fd6c (diff) | |
| parent | baad7a7e56e2b0f24885e01672cd9bdc6667a6a8 (diff) | |
| download | samba-30b9c37420100c98df1a538673d508e46517accf.tar.gz samba-30b9c37420100c98df1a538673d508e46517accf.tar.bz2 samba-30b9c37420100c98df1a538673d508e46517accf.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
Conflicts:
source/ntvfs/ntvfs_generic.c
(This used to be commit a626a9c69cb2c07c8de69dcfe45361f86d6de58d)
Diffstat (limited to 'source4/scripting/python/uuidmodule.c')
| -rw-r--r-- | source4/scripting/python/uuidmodule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/uuidmodule.c b/source4/scripting/python/uuidmodule.c index cd9a1cb4d5..18cfb6ce32 100644 --- a/source4/scripting/python/uuidmodule.c +++ b/source4/scripting/python/uuidmodule.c @@ -27,7 +27,7 @@ static PyObject *uuid_random(PyObject *self, PyObject *args) PyObject *pyobj; char *str; - if (!PyArg_ParseTuple(args, (char *)"")) + if (!PyArg_ParseTuple(args, "")) return NULL; guid = GUID_random(); @@ -52,7 +52,7 @@ static PyMethodDef methods[] = { void inituuid(void) { - PyObject *mod = Py_InitModule3((char *)"uuid", methods, "UUID helper routines"); + PyObject *mod = Py_InitModule3("uuid", methods, "UUID helper routines"); if (mod == NULL) return; } |