From: W. Trevor King <wking@tremily.us>
Date: Fri, 19 Oct 2012 04:50:21 +0000 (-0400)
Subject: python: Use Cython's libc.errno for EEXIST.
X-Git-Tag: v17~10^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0ff45a04886e12540d2dd00e226c3e17587b6b9;p=thirdparty%2Fkmod.git

python: Use Cython's libc.errno for EEXIST.
---

diff --git a/libkmod/python/kmod/_libkmod_h.pxd b/libkmod/python/kmod/_libkmod_h.pxd
index ef948dd0..0153ac02 100644
--- a/libkmod/python/kmod/_libkmod_h.pxd
+++ b/libkmod/python/kmod/_libkmod_h.pxd
@@ -18,10 +18,6 @@ cdef extern from *:
     ctypedef void* const_void_ptr 'const void *'
 
 
-cdef extern from 'errno.h':
-    enum: EEXIST
-
-
 cdef extern from 'stdbool.h':
     ctypedef struct bool:
         pass
diff --git a/libkmod/python/kmod/module.pyx b/libkmod/python/kmod/module.pyx
index 379a75d0..7c84eb84 100644
--- a/libkmod/python/kmod/module.pyx
+++ b/libkmod/python/kmod/module.pyx
@@ -9,6 +9,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+cimport libc.errno as _errno
+
 cimport _libkmod_h
 from error import KmodError as _KmodError
 cimport list as _list
@@ -103,7 +105,7 @@ cdef class Module (object):
         # TODO: convert callbacks and data from Python object to C types
         err = _libkmod_h.kmod_module_probe_insert_module(
             self.module, flags, opt, install, d, print_action)
-        if err == -_libkmod_h.EEXIST:
+        if err == -_errno.EEXIST:
             raise _KmodError('Module already loaded')
         elif err < 0:
             raise _KmodError('Could not load module')