From 01d9a65eac814d3f91a5e20840b767c75de13fcc Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 2 Sep 2014 22:16:30 +0200 Subject: add libgamma-native.hh that includes libgamma.h without language conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/libgamma-error.hh | 6 +----- src/libgamma-native.hh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 src/libgamma-native.hh 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 -extern "C" -{ -# include -# include -} +#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 . + */ +#ifndef LIBGAMMA_NATIVE_HH +#define LIBGAMMA_NATIVE_HH + + +extern "C" +{ +# ifdef __GCC__ +# define restrict __restrict__ +# else +# define restrict /* remove */ +# endif +# define this self +# include +# undef this +} + + +#endif + -- cgit v1.2.3-70-g09d2