Fix compilation with Python 3.12+.

Define PyUnicode_GetSize(X)=PyUnicode_GetLength(X) macro to replace removed API with a new one.
wilx · Nov 23, 2024 · 3a568c9 · 3a568c9
1 parent c482c7a
commit 3a568c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -1369,7 +1369,8 @@ liblog4cplus_la_LDFLAGS = $(common_liblog4cplus_la_ldflags)
 @WITH_PYTHON_TRUE@_log4cplus_la_SOURCES = $(PYTHON_WRAP_CXX) $(SWIG_SOURCES)
 @WITH_PYTHON_TRUE@_log4cplus_la_CPPFLAGS = $(AM_CPPFLAGS) $(SWIG_PYTHON_CPPFLAGS) \
 @WITH_PYTHON_TRUE@  $(PYTHON_CPPFLAGS) -DSWIG_TYPE_TABLE=log4cplus \
-@WITH_PYTHON_TRUE@  "-Dregister=/*register*/"
+@WITH_PYTHON_TRUE@  "-Dregister=/*register*/" \
+@WITH_PYTHON_TRUE@  "-DPyUnicode_GetSize(X)=PyUnicode_GetLength(X)"
 
 @WITH_PYTHON_TRUE@_log4cplus_la_LDFLAGS = -no-undefined -shared -module -avoid-version \
 @WITH_PYTHON_TRUE@  $(PYTHON_LDFLAGS) $(AM_LDFLAGS)
@@ -1379,7 +1380,8 @@ liblog4cplus_la_LDFLAGS = $(common_liblog4cplus_la_ldflags)
 @BUILD_WITH_WCHAR_T_SUPPORT_TRUE@@WITH_PYTHON_TRUE@_log4cplusU_la_SOURCES = $(PYTHON_WRAPU_CXX) $(SWIG_SOURCES)
 @BUILD_WITH_WCHAR_T_SUPPORT_TRUE@@WITH_PYTHON_TRUE@_log4cplusU_la_CPPFLAGS = $(AM_CPPFLAGS) -DUNICODE=1 \
 @BUILD_WITH_WCHAR_T_SUPPORT_TRUE@@WITH_PYTHON_TRUE@  $(SWIG_PYTHON_CPPFLAGS) $(PYTHON_CPPFLAGS) -DSWIG_TYPE_TABLE=log4cplus \
-@BUILD_WITH_WCHAR_T_SUPPORT_TRUE@@WITH_PYTHON_TRUE@  "-Dregister=/*register*/"
+@BUILD_WITH_WCHAR_T_SUPPORT_TRUE@@WITH_PYTHON_TRUE@  "-Dregister=/*register*/" \
+@BUILD_WITH_WCHAR_T_SUPPORT_TRUE@@WITH_PYTHON_TRUE@  "-DPyUnicode_GetSize(X)=PyUnicode_GetLength(X)"
 
 @BUILD_WITH_WCHAR_T_SUPPORT_TRUE@@WITH_PYTHON_TRUE@_log4cplusU_la_LDFLAGS = -no-undefined -shared -module -avoid-version \
 @BUILD_WITH_WCHAR_T_SUPPORT_TRUE@@WITH_PYTHON_TRUE@  $(PYTHON_LDFLAGS) $(AM_LDFLAGS)

diff --git a/swig/python/Makefile.am b/swig/python/Makefile.am
@@ -7,7 +7,8 @@ pkgpyexec_LTLIBRARIES = _log4cplus.la
 _log4cplus_la_SOURCES = $(PYTHON_WRAP_CXX) $(SWIG_SOURCES)
 _log4cplus_la_CPPFLAGS = $(AM_CPPFLAGS) $(SWIG_PYTHON_CPPFLAGS) \
   $(PYTHON_CPPFLAGS) -DSWIG_TYPE_TABLE=log4cplus \
-  "-Dregister=/*register*/"
+  "-Dregister=/*register*/" \
+  "-DPyUnicode_GetSize(X)=PyUnicode_GetLength(X)"
 _log4cplus_la_LDFLAGS = -no-undefined -shared -module -avoid-version \
   $(PYTHON_LDFLAGS) $(AM_LDFLAGS)
 _log4cplus_la_LIBADD = $(liblog4cplus_la_file)
@@ -27,7 +28,8 @@ pkgpyexec_LTLIBRARIES += _log4cplusU.la
 _log4cplusU_la_SOURCES = $(PYTHON_WRAPU_CXX) $(SWIG_SOURCES)
 _log4cplusU_la_CPPFLAGS = $(AM_CPPFLAGS) -DUNICODE=1 \
   $(SWIG_PYTHON_CPPFLAGS) $(PYTHON_CPPFLAGS) -DSWIG_TYPE_TABLE=log4cplus \
-  "-Dregister=/*register*/"
+  "-Dregister=/*register*/" \
+  "-DPyUnicode_GetSize(X)=PyUnicode_GetLength(X)"
 _log4cplusU_la_LDFLAGS = -no-undefined -shared -module -avoid-version \
   $(PYTHON_LDFLAGS) $(AM_LDFLAGS)
 _log4cplusU_la_LIBADD = $(liblog4cplusU_la_file)