[PD-cvs] externals/zexy/src zexy.h,1.20,1.21 zexyconf.h.in,1.2,1.3

IOhannes m zmölnig zmoelnig at users.sourceforge.net
Thu Oct 19 11:48:39 CEST 2006


Update of /cvsroot/pure-data/externals/zexy/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31107

Modified Files:
	zexy.h zexyconf.h.in 
Log Message:
protect zexyconf.h against re-inclusion;
use the protection in zexy.h (so we can force zexyconf.h to not be
included)


Index: zexyconf.h.in
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/zexyconf.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** zexyconf.h.in	14 Dec 2005 19:03:28 -0000	1.2
--- zexyconf.h.in	19 Oct 2006 09:48:37 -0000	1.3
***************
*** 1,2 ****
--- 1,4 ----
+ #ifndef _ZEXYCONF_H_
+ #define _ZEXYCONF_H_
  
  /* Define if you have the <regex.h> header file.  */
***************
*** 15,17 ****
--- 17,20 ----
  #undef HAVE_LINUX_PPDEV_H
  
+ #endif /* _ZEXYCONF_H_ */
  

Index: zexy.h
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/zexy.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** zexy.h	17 Oct 2006 07:49:46 -0000	1.20
--- zexy.h	19 Oct 2006 09:48:37 -0000	1.21
***************
*** 40,44 ****
  #endif
  
! #include "zexyconf.h"
  
  #include "m_pd.h"
--- 40,50 ----
  #endif
  
! /* 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"





More information about the Pd-cvs mailing list