Code drop from //branches/cupcake/...@124589

[android-x86/external-libffi.git] / include / ffi_common.h

diff --git a/include/ffi_common.h b/include/ffi_common.h
index 3620a2e..26e1394 100644 (file)
--- a/include/ffi_common.h
+++ b/include/ffi_common.h
@@ -1,5 +1,6 @@
 /* -----------------------------------------------------------------------
    ffi_common.h - Copyright (c) 1996  Red Hat, Inc.
+   Copyright (C) 2007 Free Software Foundation, Inc
 
    Common internal definitions and macros. Only necessary for building
    libffi.
@@ -17,8 +18,11 @@ extern "C" {
 /* Do not move this. Some versions of AIX are very picky about where
    this is positioned. */
 #ifdef __GNUC__
-# define alloca __builtin_alloca
+//# define alloca __builtin_alloca  /* ANDROID removed, clashes w/bionic */
+# include <alloca.h>                /* ANDROID added */
+# define MAYBE_UNUSED __attribute__((__unused__))
 #else
+# define MAYBE_UNUSED
 # if HAVE_ALLOCA_H
 #  include <alloca.h>
 # else