← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/3rdparty/patches/freetype-2.3.6-vxworks.patch

  • 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/patches/freetype-2.3.6-vxworks.patch
 
1
diff --git builds/unix/ftsystem.c builds/unix/ftsystem.c
 
2
index 3a740fd..40fa8d0 100644
 
3
--- builds/unix/ftsystem.c
 
4
+++ builds/unix/ftsystem.c
 
5
@@ -69,6 +69,9 @@
 
6
 #include <string.h>
 
7
 #include <errno.h>
 
8
 
 
9
+#ifdef VXWORKS
 
10
+#include <ioLib.h>
 
11
+#endif
 
12
 
 
13
   /*************************************************************************/
 
14
   /*                                                                       */
 
15
@@ -238,7 +241,7 @@
 
16
       return FT_Err_Invalid_Stream_Handle;
 
17
 
 
18
     /* open the file */
 
19
-    file = open( filepathname, O_RDONLY );
 
20
+    file = open( filepathname, O_RDONLY, 0);
 
21
     if ( file < 0 )
 
22
     {
 
23
       FT_ERROR(( "FT_Stream_Open:" ));
 
24
@@ -317,7 +320,11 @@
 
25
 
 
26
 
 
27
         read_count = read( file,
 
28
+#ifndef VXWORKS
 
29
                            stream->base + total_read_count,
 
30
+#else
 
31
+                           (char *) stream->base + total_read_count,
 
32
+#endif
 
33
                            stream->size - total_read_count );
 
34
 
 
35
         if ( read_count <= 0 )