From c5588f55f0428e0cb6b730004c45b45e7529e703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Thu, 19 Oct 2006 09:48:37 +0000 Subject: protect zexyconf.h against re-inclusion; use the protection in zexy.h (so we can force zexyconf.h to not be included) svn path=/trunk/externals/zexy/; revision=6143 --- src/zexy.h | 8 +++++++- src/zexyconf.h.in | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/zexy.h b/src/zexy.h index 46c6bb7..ba2bec3 100644 --- a/src/zexy.h +++ b/src/zexy.h @@ -39,7 +39,13 @@ # endif #endif -#include "zexyconf.h" +/* usually the re-inclusion magic is done in the header-file itself + * however, we do it outside, so we can force zexyconf.h to not be used + * (e.g. from by definig the INCLUDE_SH1T in externals/build/src/* + */ +#ifndef INCLUDE_ZEXYCONF_H__ +# include "zexyconf.h" +#endif /* INCLUDE_ZEXYCONF_H__ */ #include "m_pd.h" diff --git a/src/zexyconf.h.in b/src/zexyconf.h.in index 1b6698a..160668c 100644 --- a/src/zexyconf.h.in +++ b/src/zexyconf.h.in @@ -1,3 +1,5 @@ +#ifndef _ZEXYCONF_H_ +#define _ZEXYCONF_H_ /* Define if you have the header file. */ #undef HAVE_REGEX_H @@ -14,4 +16,5 @@ */ #undef HAVE_LINUX_PPDEV_H +#endif /* _ZEXYCONF_H_ */ -- cgit v1.2.1