aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2014-09-02 22:16:30 +0200
committerMattias Andrée <maandree@operamail.com>2014-09-02 22:16:30 +0200
commit01d9a65eac814d3f91a5e20840b767c75de13fcc (patch)
tree3c49221aa6e3580842d723b21c0c5e83eb156c8e
parentmost of libgamma-error (diff)
downloadlibgammamm-01d9a65eac814d3f91a5e20840b767c75de13fcc.tar.gz
libgammamm-01d9a65eac814d3f91a5e20840b767c75de13fcc.tar.bz2
libgammamm-01d9a65eac814d3f91a5e20840b767c75de13fcc.tar.xz
add libgamma-native.hh that includes libgamma.h without language conflicts
Signed-off-by: Mattias Andrée <maandree@operamail.com>
-rw-r--r--src/libgamma-error.hh6
-rw-r--r--src/libgamma-native.hh36
2 files changed, 37 insertions, 5 deletions
diff --git a/src/libgamma-error.hh b/src/libgamma-error.hh
index e4c8f4c..a30b2c7 100644
--- a/src/libgamma-error.hh
+++ b/src/libgamma-error.hh
@@ -21,11 +21,7 @@
#include <string>
-extern "C"
-{
-# include <libgamma-config.h>
-# include <libgamma-error.h>
-}
+#include "libgamma-native.hh"
namespace libgamma
diff --git a/src/libgamma-native.hh b/src/libgamma-native.hh
new file mode 100644
index 0000000..84ab806
--- /dev/null
+++ b/src/libgamma-native.hh
@@ -0,0 +1,36 @@
+/**
+ * libgammamm -- C++ wrapper for libgamma
+ * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org)
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef LIBGAMMA_NATIVE_HH
+#define LIBGAMMA_NATIVE_HH
+
+
+extern "C"
+{
+# ifdef __GCC__
+# define restrict __restrict__
+# else
+# define restrict /* remove */
+# endif
+# define this self
+# include <libgamma.h>
+# undef this
+}
+
+
+#endif
+