This is the mail archive of the ecos-patches@sources.redhat.com mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Fix to zlib for stlport incompatiblity


I'm having problems with zlib and stlport.org. Basically "const" is
#define'd to an empty string.

Below is the change I made to make my program compile.

Hopefully someone who is familiar with zlib and stlport, can point out
how to properly fix this.

Øyvind

Index: ecos/packages/services/compress/zlib/current/include/zconf.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/compress/zlib/current/include/zconf.h,v
retrieving revision 1.3
diff -a -w -u -r1.3 zconf.h
--- ecos/packages/services/compress/zlib/current/include/zconf.h	19 Oct 2001 07:02:44 -0000	1.3
+++ ecos/packages/services/compress/zlib/current/include/zconf.h	26 Jan 2004 08:57:00 -0000
@@ -82,10 +82,12 @@
 #endif
 #endif // __ECOS__
 
+#ifndef __ECOS__
 #ifndef STDC
 #  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
 #    define const
 #  endif
+#endif
 #endif
 
 /* Some Mac compilers merge all .h files incorrectly: */

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]