1.1 --- a/tools/python/xen/lowlevel/xs/xs.c	Mon Nov 21 17:48:22 2005 +0100
     1.2 +++ b/tools/python/xen/lowlevel/xs/xs.c	Mon Nov 21 18:34:25 2005 +0100
     1.3 @@ -41,7 +41,8 @@
     1.4  #define PyMODINIT_FUNC DL_EXPORT(void)
     1.5  #endif
     1.6  
     1.7 -#define PYPKG    "xen.lowlevel.xs"
     1.8 +#define PKG "xen.lowlevel.xs"
     1.9 +#define CLS "xs"
    1.10  
    1.11  /** Python wrapper round an xs handle.
    1.12   */
    1.13 @@ -847,7 +848,7 @@ static void xshandle_dealloc(XsHandle *s
    1.14  static PyTypeObject xshandle_type = {
    1.15      PyObject_HEAD_INIT(NULL)
    1.16      0,
    1.17 -    "xen.lowlevel.xs.xs",
    1.18 +    PKG "." CLS,
    1.19      sizeof(XsHandle),
    1.20      0,
    1.21      (destructor)xshandle_dealloc, /* tp_dealloc        */
    1.22 @@ -895,13 +896,13 @@ PyMODINIT_FUNC initxs(void)
    1.23      if (PyType_Ready(&xshandle_type) < 0)
    1.24          return;
    1.25  
    1.26 -    m = Py_InitModule("xen.lowlevel.xs", xs_methods);
    1.27 +    m = Py_InitModule(PKG, xs_methods);
    1.28  
    1.29      if (m == NULL)
    1.30        return;
    1.31  
    1.32      Py_INCREF(&xshandle_type);
    1.33 -    PyModule_AddObject(m, "xs", (PyObject *)&xshandle_type);
    1.34 +    PyModule_AddObject(m, CLS, (PyObject *)&xshandle_type);
    1.35  }
    1.36  
    1.37