summaryrefslogtreecommitdiff
path: root/gruel
diff options
context:
space:
mode:
authorJosh Blum2011-08-17 12:30:09 -0700
committerJosh Blum2011-08-17 12:30:09 -0700
commitfb2f45cdddc41d5aba177204aa419cea3a0aea49 (patch)
treee2d3195b9782e047518fe1ea9f848346b480cfd4 /gruel
parente6ed4fa7bb0d253adbf0cf2ae4da7c301b3c971f (diff)
parent626018eb037808cdc32b5eb1907ae9d5f80d3e55 (diff)
downloadgnuradio-fb2f45cdddc41d5aba177204aa419cea3a0aea49.tar.gz
gnuradio-fb2f45cdddc41d5aba177204aa419cea3a0aea49.tar.bz2
gnuradio-fb2f45cdddc41d5aba177204aa419cea3a0aea49.zip
Merge branch 'next' into digital
Diffstat (limited to 'gruel')
-rw-r--r--gruel/src/include/gruel/attributes.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/gruel/src/include/gruel/attributes.h b/gruel/src/include/gruel/attributes.h
index 8c9a57b47..baa5521c8 100644
--- a/gruel/src/include/gruel/attributes.h
+++ b/gruel/src/include/gruel/attributes.h
@@ -54,6 +54,13 @@
#endif
////////////////////////////////////////////////////////////////////////
+// define inline when building C
+////////////////////////////////////////////////////////////////////////
+#if defined(_MSC_VER) && !defined(__cplusplus) && !defined(inline)
+# define inline __inline
+#endif
+
+////////////////////////////////////////////////////////////////////////
// suppress warnings
////////////////////////////////////////////////////////////////////////
#ifdef _MSC_VER