"Gabor Z. Papp" <gzp@xxxxxxx> reports: trying to compile nfs-utils 1.2.3 on linux kernel 2.4.37.10, glibc 2.2.5: cc -DHAVE_CONFIG_H -I. -I../../support/include -D_GNU_SOURCE -Wall -Wextra -Wstrict-prototypes -pipe -g -O2 -MT file.o -MD -MP -MF .deps/file.Tpo -c -o file.o file.c file.c:638: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'static' file.c: In function 'nsm_insert_monitored_host': file.c:747: warning: implicit declaration of function 'nsm_create_monitor_record' file.c: At top level: file.c:788: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'static' file.c: In function 'nsm_read_line': file.c:842: warning: implicit declaration of function 'nsm_parse_line' make[3]: *** [file.o] Error 1 make[3]: Leaving directory `/home/gzp/src/nfs-utils-1.2.3/support/nsm' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/gzp/src/nfs-utils-1.2.3/support/nsm' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/gzp/src/nfs-utils-1.2.3/support' make: *** [all-recursive] Error 1 [kernel] Linux gzpLinux 2.4.37.10-gzpLinux #1 Mon Oct 4 08:57:02 CEST 2010 i686 GNU/Linux [glibc] GNU C Library stable release version 2.2.5, by Roland McGrath et al. Compiled by GNU CC version 3.3.6. Compiled on a Linux 2.4.36.2-gzpLinux system on 2008-03-22. [gcc] gcc (GCC) 4.4.5 [binutils] GNU ld (Linux/GNU Binutils) 2.21.51.0.1.20101110 === cut here === sys/cdefs.c in glibc 2.2.5 does not define __attribute_noinline__. Replace the __attribute_noinline__ form with __attribute__((__noinline__)). Even though the compiler didn't complain about __attribute_malloc__, also replace those in order to maintain consistent style throughout the source file. Fix for: https://bugzilla.linux-nfs.org/show_bug.cgi?id=194 Reported-by: "Gabor Z. Papp" <gzp@xxxxxxx> Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx> --- support/nsm/file.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/nsm/file.c b/support/nsm/file.c index ba2a9ce..6ea6ab6 100644 --- a/support/nsm/file.c +++ b/support/nsm/file.c @@ -126,7 +126,7 @@ exact_error_check(const ssize_t len, const size_t buflen) * containing an appropriate pathname, or NULL if an error * occurs. Caller must free the returned result with free(3). */ -__attribute_malloc__ +__attribute__((__malloc__)) static char * nsm_make_record_pathname(const char *directory, const char *hostname) { @@ -174,7 +174,7 @@ nsm_make_record_pathname(const char *directory, const char *hostname) * containing an appropriate pathname, or NULL if an error * occurs. Caller must free the returned result with free(3). */ -__attribute_malloc__ +__attribute__((__malloc__)) static char * nsm_make_pathname(const char *directory) { @@ -204,7 +204,7 @@ nsm_make_pathname(const char *directory) * containing an appropriate pathname, or NULL if an error * occurs. Caller must free the returned result with free(3). */ -__attribute_malloc__ +__attribute__((__malloc__)) static char * nsm_make_temp_pathname(const char *pathname) { @@ -650,7 +650,7 @@ nsm_priv_to_hex(const char *priv, char *buf, const size_t buflen) /* * Returns the length in bytes of the created record. */ -__attribute_noinline__ +__attribute__((__noinline__)) static size_t nsm_create_monitor_record(char *buf, const size_t buflen, const struct sockaddr *sap, const struct mon *m) @@ -800,7 +800,7 @@ out: return result; } -__attribute_noinline__ +__attribute__((__noinline__)) static _Bool nsm_parse_line(char *line, struct sockaddr_in *sin, struct mon *m) { -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
