X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/d264541a3e7fe756695f811136d7a89e8e7ec478..5e8ac5e02a09140e97d56a9d5313504dfa31282d:/include/common.h

diff --git a/include/common.h b/include/common.h
index 10c4417..12d87c4 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,12 +1,24 @@
 /*
  * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
  *
- * SPDX-License-Identifier:	GPL-2.0+
+ * SPDX-License-Identifier:	GPL-2.0
  */
 
 #ifndef COMMON_H
 #define COMMON_H
 
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <stdlib.h>
+#include "errnum.h"
+
+#define GCC_VERSION (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
+
+#define USED __attribute__((used))
+#define UNUSED __attribute__((unused))
+
 #ifdef __AVR__
 #include <avr/io.h>
 #include <avr/pgmspace.h>
@@ -27,17 +39,18 @@ struct bits {
 
 #define SBIT(port,pin) ((*(volatile struct bits*)&port).b##pin)
 
-//TODO:
+//GCC bug PR61443
 //  Known to work: 4.8.4, 4.9.1
 //  Known to fail: 4.8.3, 4.9.0
+
+#if (GCC_VERSION < 40804) || (GCC_VERSION == 40900)
 #define GCC_BUG_61443 1
+#endif /* PR61443 */
 
 #else
 // TODO: stm32
 #endif /* __AVR__ */
 
-#include <stdio.h>
-
 #ifdef __FLASH
 #define FLASH __flash
 #define MEMX __memx
@@ -70,18 +83,18 @@ extern volatile uint_least8_t Stat;
 #define S_CON_PENDING	(1<<2)
 
 static inline
-void my_puts(const char *s)
+int my_puts(const char *s)
 {
-	fputs(s, stdout);
+	return fputs(s, stdout);
 }
 
 static inline
-void my_puts_P(const char *s)
+int my_puts_P(const char *s)
 {
 #ifdef __AVR__
-	fputs_P(s, stdout);
+	return fputs_P(s, stdout);
 #else
-	fputs(s, stdout);
+	return fputs(s, stdout);
 #endif /* __AVR__ */
 }