mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-17 10:45:45 +00:00
dd3ce95fb0
There's conflict of config.h between dovecot and lib32-dovecot. The differences of config-64.h and config-32.h are as follows: @@ -774,7 +774,7 @@ #define MODULE_SUFFIX ".so" /* Maximum value of off_t */ -#define OFF_T_MAX LONG_MAX +#define OFF_T_MAX LLONG_MAX /* Name of package */ #define PACKAGE "dovecot" @@ -834,7 +834,7 @@ #define PRIdTIME_T "ld" /* printf() format for uoff_t */ -#define PRIuUOFF_T "lu" +#define PRIuUOFF_T "llu" /* printf() fmt for hex time_t */ #define PRIxTIME_T "lx" @@ -846,19 +846,19 @@ #define SIZEOF_INT 4 /* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 8 +#define SIZEOF_LONG 4 /* The size of `long long', as computed by sizeof. */ #define SIZEOF_LONG_LONG 8 /* The size of `void *', as computed by sizeof. */ -#define SIZEOF_VOID_P 8 +#define SIZEOF_VOID_P 4 /* Build SQL drivers as plugins */ /* #undef SQL_DRIVER_PLUGINS */ /* Maximum value of ssize_t */ -#define SSIZE_T_MAX LONG_MAX +#define SSIZE_T_MAX INT_MAX /* C99 static array */ #define STATIC_ARRAY static @@ -887,13 +887,13 @@ /* #undef UOFF_T_INT */ /* Define if off_t is long */ -#define UOFF_T_LONG /**/ +/* #undef UOFF_T_LONG */ /* Define if off_t is long long */ -/* #undef UOFF_T_LONG_LONG */ +#define UOFF_T_LONG_LONG /**/ /* Maximum value of uoff_t */ -#define UOFF_T_MAX ULONG_MAX +#define UOFF_T_MAX ULLONG_MAX /* Build with checkpassword userdb support */ #define USERDB_CHECKPASSWORD /**/ @@ -935,7 +935,7 @@ #endif /* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ +#define _FILE_OFFSET_BITS 64 /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>