make constants local to XCFFIB so they don’t clash

modules which depend on this may require their own version of the same mechanism
tych0 · Dec 7, 2024 · 6af8cda · 6af8cda
1 parent 033da74
commit 6af8cda
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/module/__init__.py b/module/__init__.py
@@ -29,7 +29,7 @@
 try:
     # Note in ABI mode lib will be missing
     from _xcffib import ffi, lib
-    assert lib.__CFFI_MODE == lib.__CFFI_MODE_API
+    assert lib.__XCFFIB_CFFI_MODE == lib.__XCFFIB_CFFI_MODE_API
     cffi_mode = "API"
 except ImportError:
     try:
@@ -51,9 +51,9 @@
         if soname is None:
             soname = "libxcb.so"
     lib = ffi.dlopen(soname)  # noqa
-    if lib.__CFFI_MODE == lib.__CFFI_MODE_ABI:
+    if lib.__XCFFIB_CFFI_MODE == lib.__XCFFIB_CFFI_MODE_ABI:
         cffi_mode = "ABI"
-    elif lib.__CFFI_MODE == lib.__CFFI_MODE_ABI_PRECOMPILED:
+    elif lib.__XCFFIB_CFFI_MODE == lib.__XCFFIB_CFFI_MODE_ABI_PRECOMPILED:
         cffi_mode = "ABI(precompiled)"
 
 __xcb_proto_version__ = 'placeholder'

diff --git a/module/ffi_build.py b/module/ffi_build.py
@@ -248,9 +248,9 @@
 __CFFI_MODE_ABI = 1
 __CFFI_MODE_ABI_PRECOMPILED = 2
 CDEF += f"""
-#define __CFFI_MODE_API {__CFFI_MODE_API}
-#define __CFFI_MODE_ABI {__CFFI_MODE_ABI}
-#define __CFFI_MODE_ABI_PRECOMPILED {__CFFI_MODE_ABI_PRECOMPILED}
+#define __XCFFIB_CFFI_MODE_API {__CFFI_MODE_API}
+#define __XCFFIB_CFFI_MODE_ABI {__CFFI_MODE_ABI}
+#define __XCFFIB_CFFI_MODE_ABI_PRECOMPILED {__CFFI_MODE_ABI_PRECOMPILED}
 """
 
 
@@ -265,7 +265,7 @@ def ffi_build():
     try:
         ffi = FFI()
         ffi.cdef(CDEF + f"""
-            #define __CFFI_MODE {__CFFI_MODE_API}
+            #define __XCFFIB_CFFI_MODE {__CFFI_MODE_API}
         """)
 
         ffi.set_source_pkgconfig(
@@ -277,10 +277,10 @@ def ffi_build():
             #include "xcb/xcbext.h"
             #include "xcb/render.h"
             """ + f"""
-                #define __CFFI_MODE_API {__CFFI_MODE_API}
-                #define __CFFI_MODE_ABI {__CFFI_MODE_ABI}
-                #define __CFFI_MODE_ABI_PRECOMPILED {__CFFI_MODE_ABI_PRECOMPILED}
-                #define __CFFI_MODE {__CFFI_MODE_API}
+                #define __XCFFIB_CFFI_MODE_API {__CFFI_MODE_API}
+                #define __XCFFIB_CFFI_MODE_ABI {__CFFI_MODE_ABI}
+                #define __XCFFIB_CFFI_MODE_ABI_PRECOMPILED {__CFFI_MODE_ABI_PRECOMPILED}
+                #define __XCFFIB_CFFI_MODE {__CFFI_MODE_API}
             """
         )
 
@@ -290,7 +290,7 @@ def ffi_build():
         warn("Falling back to precompiled python mode")
         ffi = FFI()
         ffi.cdef(CDEF + f"""
-            #define __CFFI_MODE {__CFFI_MODE_ABI_PRECOMPILED}
+            #define __XCFFIB_CFFI_MODE {__CFFI_MODE_ABI_PRECOMPILED}
         """)
 
         ffi.set_source(
@@ -303,7 +303,7 @@ def ffi_build():
 
 ffi = FFI()
 ffi.cdef(CDEF + f"""
-    #define __CFFI_MODE {__CFFI_MODE_ABI}
+    #define __XCFFIB_CFFI_MODE {__CFFI_MODE_ABI}
 """)