filename | android/deps/libisofs-0.6.38.diff |
changeset | 1239:be3121267597 |
author | nkeynes |
date | Fri Jul 13 21:05:10 2012 +1000 (11 years ago) |
permissions | -rw-r--r-- |
last change | Add check that glGenFencesNV is actually defined, to try to guard against installations with a broken libGL |
view | annotate | diff | log | raw |
1 diff -ur libisofs-0.6.38/demo/demo.c libisofs-0.6.38/demo/demo.c
2 --- libisofs-0.6.38/demo/demo.c 2010-08-31 19:24:04.000000000 +1000
3 +++ libisofs-0.6.38/demo/demo.c 2012-02-16 18:07:47.000000000 +1000
4 @@ -311,7 +311,7 @@
6 fp = fopen(argv[optind+1], "w");
7 if (fp == NULL) {
8 - err(1, "error opening output file");
9 + fprintf(stderr, "error opening output file");
10 goto ex;
11 }
13 @@ -639,7 +639,7 @@
15 fp = fopen(argv[3], "w");
16 if (fp == NULL) {
17 - err(1, "error opening output file");
18 + fprintf(stderr, "error opening output file");
19 goto ex;
20 }
22 @@ -749,7 +749,7 @@
24 fp = fopen(argv[5], "w");
25 if (!fp) {
26 - err(1, "error opening output file");
27 + fprintf(stderr, "error opening output file");
28 goto ex;
29 }
31 diff -ur libisofs-0.6.38/libisofs/ecma119.c libisofs-0.6.38/libisofs/ecma119.c
32 --- libisofs-0.6.38/libisofs/ecma119.c 2010-10-19 20:41:15.000000000 +1000
33 +++ libisofs-0.6.38/libisofs/ecma119.c 2012-02-16 17:57:46.000000000 +1000
34 @@ -38,7 +38,7 @@
35 #include <time.h>
36 #include <string.h>
37 #include <locale.h>
38 -#include <langinfo.h>
39 +//#include <langinfo.h>
40 #include <stdio.h>
42 #ifdef Xorriso_standalonE
43 diff -ur libisofs-0.6.38/libisofs/fs_image.c libisofs-0.6.38/libisofs/fs_image.c
44 --- libisofs-0.6.38/libisofs/fs_image.c 2010-08-31 20:05:09.000000000 +1000
45 +++ libisofs-0.6.38/libisofs/fs_image.c 2012-02-16 17:53:29.000000000 +1000
46 @@ -30,7 +30,7 @@
47 #include <stdlib.h>
48 #include <string.h>
49 #include <locale.h>
50 -#include <langinfo.h>
51 +//#include <langinfo.h>
52 #include <limits.h>
53 #include <stdio.h>
55 diff -ur libisofs-0.6.38/libisofs/util.c libisofs-0.6.38/libisofs/util.c
56 --- libisofs-0.6.38/libisofs/util.c 2010-05-29 06:33:28.000000000 +1000
57 +++ libisofs-0.6.38/libisofs/util.c 2012-02-16 17:57:28.000000000 +1000
58 @@ -27,7 +27,7 @@
59 #include <limits.h>
60 #include <iconv.h>
61 #include <locale.h>
62 -#include <langinfo.h>
63 +//#include <langinfo.h>
65 #include <unistd.h>
67 @@ -185,7 +185,11 @@
68 {
69 if(libisofs_local_charset[0])
70 return libisofs_local_charset;
71 +#ifdef __ANDROID__
72 + return "UTF-8";
73 +#else
74 return nl_langinfo(CODESET);
75 +#endif
76 }
78 int strconv(const char *str, const char *icharset, const char *ocharset,
.