Hi again! I missed one patch for working around a GCC bug in Debian Etch regarding limit definitions. Sorry for the unstripped git-format-patch outputs, I just realised this after pressing send :( (This seems to be not my day :)) Ciao Max -- Gib Dein Bestes. Dann übertriff Dich selbst!

* src/storage_backend_fs.c: Work around broken limits.h in Debian Etch. --- src/storage_backend_fs.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c index ca6d329..599cf1a 100644 --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -44,6 +44,12 @@ #include "memory.h" #include "xml.h" +/* Work around broken limits.h on debian etch */ +#if defined __GNUC__ && defined _GCC_LIMITS_H_ && ! defined ULLONG_MAX +# define ULLONG_MAX ULONG_LONG_MAX +#endif

Anno domini 2009 Daniel P. Berrange scripsit: > > I missed one patch for working around a GCC bug in Debian Etch > > regarding limit definitions. > > Sorry for the unstripped git-format-patch outputs, I just realised > > this after pressing send :( > > (This seems to be not my day :)) > Since it is 'internal.h' that pulls in limits.h, we should probably > just put that logic in internal.h, so it is visible to all libvirt > source files, and delete the duplicate in storage_conf.c Here we go.

diff --git a/src/internal.h b/src/internal.h index cf7e196..936cd03 100644 --- a/src/internal.h +++ b/src/internal.h @@ -73,8 +73,14 @@ #else #define __GNUC_PREREQ(maj,min) 0 #endif + +/* Work around broken limits.h on debian etch */ +#if defined _GCC_LIMITS_H_ && ! defined ULLONG_MAX +#define ULLONG_MAX ULONG_LONG_MAX #endif +#endif /* __GNUC__ */ + /** * ATTRIBUTE_UNUSED: * diff --git a/src/storage_conf.c b/src/storage_conf.c index 075279c..245b2d0 100644 --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -45,11 +45,6 @@ #define VIR_FROM_THIS VIR_FROM_STORAGE -/* Work around broken limits.h on debian etch */ -#if defined __GNUC__ && defined _GCC_LIMITS_H_ && ! defined ULLONG_MAX -# define ULLONG_MAX ULONG_LONG_MAX -#endif - #define virStorageError(conn, code, fmt...) \ virReportErrorHelper(conn, VIR_FROM_STORAGE, code, __FILE__,\ __FUNCTION__, __LINE__, fmt)

-- Libvir-list mailing list Libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list