summaryrefslogtreecommitdiff
path: root/src/moxie
diff options
context:
space:
mode:
authorAnthony Green <green@moxielogic.com>2012-03-19 23:07:35 -0400
committerAnthony Green <green@moxielogic.com>2012-03-19 23:07:35 -0400
commit84d3253f86dad6b4f261231935675d35fd964b05 (patch)
tree7f6c2c97f595b907c38953b1e797954d7d16d457 /src/moxie
parent964c5b93f80dcaacf73056b7d15a4d2b4b7a217c (diff)
downloadlibffi-84d3253f86dad6b4f261231935675d35fd964b05.tar.gz
Rebase post GCC merge
Diffstat (limited to 'src/moxie')
-rw-r--r--src/moxie/ffitarget.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/moxie/ffitarget.h b/src/moxie/ffitarget.h
index 75bb8cc..f5305d1 100644
--- a/src/moxie/ffitarget.h
+++ b/src/moxie/ffitarget.h
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------*-C-*-
- ffitarget.h - Copyright (c) 2012, 2009 Anthony Green
+ ffitarget.h - Copyright (c) 2009 Anthony Green
Target configuration macros for Moxie
Permission is hereby granted, free of charge, to any person obtaining
@@ -27,10 +27,6 @@
#ifndef LIBFFI_TARGET_H
#define LIBFFI_TARGET_H
-#ifndef LIBFFI_H
-#error "Please do not include ffitarget.h directly into your source. Use ffi.h instead."
-#endif
-
/* ---- System specific configurations ----------------------------------- */
#ifndef LIBFFI_ASM
@@ -39,9 +35,13 @@ typedef signed long ffi_sarg;
typedef enum ffi_abi {
FFI_FIRST_ABI = 0,
+
+#ifdef MOXIE
FFI_EABI,
- FFI_LAST_ABI,
- FFI_DEFAULT_ABI = FFI_EABI
+ FFI_DEFAULT_ABI = FFI_EABI,
+#endif
+
+ FFI_LAST_ABI = FFI_DEFAULT_ABI + 1
} ffi_abi;
#endif