From: Eric Blake Date: Thu, 15 Apr 2010 17:37:25 +0000 (-0600) Subject: maint: another preprocessor fix X-Git-Tag: v0.8.1~121 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf4dee3615c7b6f6d49e59baa93c3a0db2c71010;p=thirdparty%2Flibvirt.git maint: another preprocessor fix Regression introduced in commit 62170b995. * src/util/memory.h: Placate cppi, and fit 80 columns. --- diff --git a/src/util/memory.h b/src/util/memory.h index ad458a6bd8..60e2be66f8 100644 --- a/src/util/memory.h +++ b/src/util/memory.h @@ -1,6 +1,7 @@ /* * memory.c: safer memory allocation * + * Copyright (C) 2010 Red Hat, Inc. * Copyright (C) 2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -102,7 +103,7 @@ void virFree(void *ptrptr); * arithmetic overflow in the allocation size. The check is * essentially the same as that in gnulib's xalloc_oversized. */ -#define VIR_ALLOC_VAR_OVERSIZED(M, N, S) ((((size_t)-1) - (M)) / (S) < (N)) +# define VIR_ALLOC_VAR_OVERSIZED(M, N, S) ((((size_t)-1) - (M)) / (S) < (N)) /** * VIR_ALLOC_VAR: @@ -121,7 +122,8 @@ void virFree(void *ptrptr); * Returns -1 on failure, 0 on success */ -#define VIR_ALLOC_VAR(ptr, type, count) virAllocVar(&(ptr), sizeof(*(ptr)), sizeof(type), (count)) +# define VIR_ALLOC_VAR(ptr, type, count) \ + virAllocVar(&(ptr), sizeof(*(ptr)), sizeof(type), (count)) /** * VIR_FREE: