From 6f62a7c25efc0fa94730c64ad442d33218be799d Mon Sep 17 00:00:00 2001
From: Frode Solheim <frode@fs-uae.net>
Date: Sat, 5 Sep 2015 10:55:46 +0200
Subject: [PATCH] qemuvgaglue.h, slirp.h: trivial changes

---
 include/uae/inline.h  | 47 +++++++++++++++++++++++++++++++++++++++++++
 qemuvga/qemuuaeglue.h | 12 ++---------
 slirp/slirp.h         |  2 +-
 3 files changed, 50 insertions(+), 11 deletions(-)
 create mode 100644 include/uae/inline.h

diff --git a/include/uae/inline.h b/include/uae/inline.h
new file mode 100644
index 00000000..d104c4d5
--- /dev/null
+++ b/include/uae/inline.h
@@ -0,0 +1,47 @@
+#ifndef UAE_INLINE_H
+#define UAE_INLINE_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+// FIXME: could be named funcattr.h or something, perhaps
+// FIXME: move regparams here?
+
+#if defined(HAVE_FUNC_ATTRIBUTE_ALWAYS_INLINE)
+#define UAE_STATIC_INLINE static __inline__ __attribute__ ((always_inline))
+#elif defined(_MSC_VER)
+#define UAE_STATIC_INLINE static __forceinline
+#else
+#define UAE_STATIC_INLINE static inline
+#endif
+
+#if defined(HAVE_FUNC_ATTRIBUTE_NOINLINE)
+#define UAE_NOINLINE __attribute__ ((noinline))
+#elif defined(_MSC_VER)
+#define UAE_NOINLINE __declspec(noinline)
+#else
+#define UAE_NOINLINE
+#endif
+
+#if defined(HAVE_FUNC_ATTRIBUTE_NORETURN)
+#define UAE_NORETURN __attribute__ ((noreturn))
+#elif defined(_MSC_VER)
+#define UAE_NORETURN __declspec(noreturn)
+#else
+#define UAE_NORETURN
+#endif
+
+#ifndef STATIC_INLINE
+#define STATIC_INLINE UAE_STATIC_INLINE
+#endif
+
+#ifndef NOINLINE
+#define NOINLINE UAE_NOINLINE
+#endif
+
+#ifndef NORETURN
+#define NORETURN UAE_NORETURN
+#endif
+
+#endif /* UAE_INLINE_H */
diff --git a/qemuvga/qemuuaeglue.h b/qemuvga/qemuuaeglue.h
index 9fc9575c..374c4bd6 100644
--- a/qemuvga/qemuuaeglue.h
+++ b/qemuvga/qemuuaeglue.h
@@ -1,5 +1,5 @@
-
-
+#include "uae/inline.h"
+#include "uae/likely.h"
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -18,14 +18,6 @@ extern void write_log (const char *, ...);
 #define tostring(s)	#s
 #endif
 
-#ifndef likely
-#if __GNUC__ < 3
-#define __builtin_expect(x, n) (x)
-#endif
-#define likely(x)   __builtin_expect(!!(x), 1)
-#define unlikely(x)   __builtin_expect(!!(x), 0)
-#endif
-
 typedef int ssize_t;
 
 #ifdef _MSC_VER
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 3d815c7d..483384ff 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -12,7 +12,7 @@
 #include "slirp_config.h"
 
 #ifdef _WIN32
-# include <stdint.h>
+#include <stdint.h>
 
 typedef uint8_t u_int8_t;
 typedef uint16_t u_int16_t;
-- 
2.47.3