[foo-cvs] foo/elkfoo/include elkfoo.h,1.4,1.5

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17401

Modified Files:
	elkfoo.h 
Log Message:
restructured #include policy

Index: elkfoo.h
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/include/elkfoo.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** elkfoo.h	9 Aug 2004 01:42:04 -0000	1.4
--- elkfoo.h	13 Aug 2004 21:33:57 -0000	1.5
***************
*** 38,41 ****
--- 38,53 ----
  #define FOO_ELKFOO_H_INCLUDED
  
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+ 
+ #define Object SchemeObject	/* avoid Obj-C type clash */
+ #ifdef HAVE_FOOELK_SCHEME_H
+ #include <fooelk/scheme.h>
+ #else
+ #include <elk/scheme.h>
+ #endif
+ #undef Object
+ 
  #include <FOO/FOOObject.h>