This commit is contained in:
wb-wqs885808
2024-11-27 14:24:33 +08:00
parent c8dae10776
commit eccb938b26
2 changed files with 3 additions and 9 deletions

View File

@ -88,10 +88,7 @@ typedef enum enum_obobjtype
} ObObjType; } ObObjType;
/* add typedef for enum to avoid multiple definition of ObCollationType issue on powerpc64 ppc64le */ /* add typedef for enum to avoid multiple definition of ObCollationType issue on powerpc64 ppc64le */
#if defined(__powerpc64__) typedef enum enum_obcollationtype
typedef
#endif
enum enum_obcollationtype
{ {
CS_TYPE_INVALID = 0, CS_TYPE_INVALID = 0,
CS_TYPE_GBK_CHINESE_CI = 28, CS_TYPE_GBK_CHINESE_CI = 28,
@ -109,10 +106,7 @@ enum enum_obcollationtype
} ObCollationType; } ObCollationType;
/* add typedef for enum to avoid multiple definition of ObCollationLevel issue on powerpc64 ppc64le */ /* add typedef for enum to avoid multiple definition of ObCollationLevel issue on powerpc64 ppc64le */
#if defined(__powerpc64__) typedef enum enum_obcollationlevel
typedef
#endif
enum enum_obcollationlevel
{ {
CS_LEVEL_EXPLICIT = 0, CS_LEVEL_EXPLICIT = 0,
CS_LEVEL_NONE = 1, CS_LEVEL_NONE = 1,

View File

@ -1 +1 @@
2.2.6 2.2.7