Merge branch 'feature_227_github' into 'master'

version See merge request oceanbase-ce-publish/obconnector-c!1
oceanbase · Nov 27, 2024 · db3514a · db3514a
2 parents c8dae10 + eccb938
commit db3514a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/include/ob_object.h b/include/ob_object.h
@@ -88,10 +88,7 @@ typedef enum enum_obobjtype
 } ObObjType;
 
 /* add typedef for enum to avoid multiple definition of ObCollationType issue on powerpc64 ppc64le */
-#if defined(__powerpc64__)
- typedef
-#endif
-enum enum_obcollationtype
+typedef enum enum_obcollationtype
 {
   CS_TYPE_INVALID = 0,
   CS_TYPE_GBK_CHINESE_CI = 28,
@@ -109,10 +106,7 @@ enum enum_obcollationtype
 } ObCollationType;
 
 /* add typedef for enum to avoid multiple definition of ObCollationLevel issue on powerpc64 ppc64le */
-#if defined(__powerpc64__)
- typedef
-#endif
-enum enum_obcollationlevel
+typedef enum enum_obcollationlevel
 {
   CS_LEVEL_EXPLICIT = 0,
   CS_LEVEL_NONE = 1,

diff --git a/rpm/libobclient-VER.txt b/rpm/libobclient-VER.txt
@@ -1 +1 @@
-2.2.6
+2.2.7