[waffle] [PATCH 13/33] c99: define inline keyword and use it across waffle core

Emil Velikov emil.l.velikov at gmail.com
Mon Jul 7 10:28:20 PDT 2014


This brings us a step closer to getting waffle to build under msvc 2013.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 include/c99_compat.h             | 15 +++++++++++++++
 src/waffle/core/wcore_display.h  |  2 ++
 src/waffle/core/wcore_error.c    |  1 +
 src/waffle/core/wcore_platform.h |  1 +
 4 files changed, 19 insertions(+)

diff --git a/include/c99_compat.h b/include/c99_compat.h
index a3a5117..dc0977f 100644
--- a/include/c99_compat.h
+++ b/include/c99_compat.h
@@ -38,3 +38,18 @@
 #    define restrict
 #  endif
 #endif
+
+/*
+ * C99 inline keyword
+ */
+#ifndef inline
+#  if defined(__GNUC__)
+#    define inline __inline__
+#  elif defined(_MSC_VER)
+#    define inline __inline
+#  elif defined(__ICL)
+#    define inline __inline
+#  else
+#    define inline
+#  endif
+#endif
diff --git a/src/waffle/core/wcore_display.h b/src/waffle/core/wcore_display.h
index 0b95729..9a0357d 100644
--- a/src/waffle/core/wcore_display.h
+++ b/src/waffle/core/wcore_display.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include "c99_compat.h"
+
 #include "api_object.h"
 
 #include "wcore_util.h"
diff --git a/src/waffle/core/wcore_error.c b/src/waffle/core/wcore_error.c
index e03642d..157b47e 100644
--- a/src/waffle/core/wcore_error.c
+++ b/src/waffle/core/wcore_error.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "c99_compat.h"
 
 #include "wcore_error.h"
 #include "wcore_tinfo.h"
diff --git a/src/waffle/core/wcore_platform.h b/src/waffle/core/wcore_platform.h
index 65de879..77943e4 100644
--- a/src/waffle/core/wcore_platform.h
+++ b/src/waffle/core/wcore_platform.h
@@ -28,6 +28,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "c99_compat.h"
 
 struct wcore_config;
 struct wcore_config_attrs;
-- 
2.0.0



More information about the waffle mailing list