← Back to branch summary

~oif-team/ubuntu/natty/qt4-x11/xi2.1

« back to all changes in this revision

Viewing changes to src/3rdparty/freetype/src/gzip/zlib.h

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2009-11-02 18:30:08 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (15.2.5 experimental)
  • mto: This revision was merged to the branch mainline in revision 88.
  • Revision ID: james.westby@ubuntu.com-20091102183008-b6a4gcs128mvfb3m
Tags: upstream-4.6.0~beta1
Import upstream version 4.6.0~beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/3rdparty/freetype/src/gzip/zlib.h
28
28
  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
29
29
*/
30
30
 
 
31
#if defined(__ARMCC__) || defined(__CC_ARM)
 
32
/* Ultra ugly hack that convinces RVCT to use the systems zlib */
 
33
#include <stdapis/zlib.h>
 
34
#else /* defined(__ARMCC__) || defined(__CC_ARM) */
 
35
 
31
36
#ifndef _ZLIB_H
32
37
#define _ZLIB_H
33
38
 
828
833
#endif
829
834
 
830
835
#endif /* _ZLIB_H */
 
836
 
 
837
#endif /* defined(__ARMCC__) || defined(__CC_ARM) */