diff --git a/include/ob_object.h b/include/ob_object.h index 1adad5d..2bdf12b 100644 --- a/include/ob_object.h +++ b/include/ob_object.h @@ -87,10 +87,10 @@ typedef enum enum_obobjtype ObMaxType // invalid type, or count of obj type } ObObjType; +/* add typedef for enum to avoid multiple definition of ObCollationType issue on powerpc64 ppc64le */ #if defined(__powerpc64__) typedef #endif - enum enum_obcollationtype { CS_TYPE_INVALID = 0, @@ -108,10 +108,10 @@ enum enum_obcollationtype CS_TYPE_MAX, } ObCollationType; +/* add typedef for enum to avoid multiple definition of ObCollationLevel issue on powerpc64 ppc64le */ #if defined(__powerpc64__) typedef #endif - enum enum_obcollationlevel { CS_LEVEL_EXPLICIT = 0, @@ -290,4 +290,4 @@ void set_varchar(ObObj *obj, const char *ptr, int32_t size); int serialize_ObObj(const ObObj *obj, char *buf, const int64_t buf_len, int64_t *pos); int deserialize_ObObj(ObObj *obj, const char *buf, const int64_t data_len, int64_t *pos); int64_t get_serialize_size_ObObj(const ObObj *obj); -#endif +#endif \ No newline at end of file