merged trunk changes into branch

[proxmark3-svn] / include / common.h

diff --git a/include/common.h b/include/common.h
index ba286377fe356ac33686e4696d0badeb8e6710d0..feed109c2dfe3faa216edb89fd0852100b542896 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -18,7 +18,13 @@
 #include <at91sam7s512.h>
 typedef unsigned char byte_t;
 
 #include <at91sam7s512.h>
 typedef unsigned char byte_t;
 

-#define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))
+#ifndef MIN
+# define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+#ifndef MAX
+# define MAX(a, b) (((a) > (b)) ? (a) : (b))
+#endif
+
+#define RAMFUNC __attribute((long_call, section(".ramfunc")))

 
 #endif
 
 #endif