Allow any gcc to make use of __builtin_alloca for alloca.

[rsync/rsync.git] / popt / system.h

diff --git a/popt/system.h b/popt/system.h
index 0579b8c..50cecaf 100644 (file)
--- a/popt/system.h
+++ b/popt/system.h
@@ -85,16 +85,10 @@ char *alloca(size_t size);
 #   endif
 #  endif
 # endif
-#elif defined(__GNUC__) && defined(__STRICT_ANSI__)
+#elif !defined(alloca)
 #define alloca __builtin_alloca
 #endif
 
-/*@-redecl -redef@*/
-/*@mayexit@*/ /*@only@*/ /*@unused@*/
-char * xstrdup (const char *str)
-       /*@*/;
-/*@=redecl =redef@*/
-
 #ifndef HAVE_STRLCPY
 size_t strlcpy(char *d, const char *s, size_t bufsize);
 #endif
@@ -104,13 +98,15 @@ size_t strlcat(char *d, const char *s, size_t bufsize);
 #endif
 
 #if HAVE_MCHECK_H && defined(__GNUC__)
-#define        vmefail()       (fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL)
 static inline char *
 xstrdup(const char *s)
 {
     size_t memsize = strlen(s) + 1;
     char *ptr = malloc(memsize);
-    if (!ptr) vmefail();
+    if (!ptr) {
+       fprintf(stderr, "virtual memory exhausted.\n");
+       exit(EXIT_FAILURE);
+    }
     strlcpy(ptr, s, memsize);
     return ptr;
 }