| author | Neng Xue <neng.xue@oracle.com> |
| Fri, 14 Oct 2016 11:36:01 -0700 | |
| changeset 7111 | a0e4f5518caa |
| parent 7083 | 3821dc4d577f |
| permissions | -rw-r--r-- |
|
5711
e403424d7512
23024487 Update libidn to version 1.32
Rich Burridge <rich.burridge@oracle.com>
parents:
639
diff
changeset
|
1 |
Provide the correct include file for finding the uint32_t definition. |
|
e403424d7512
23024487 Update libidn to version 1.32
Rich Burridge <rich.burridge@oracle.com>
parents:
639
diff
changeset
|
2 |
|
|
e403424d7512
23024487 Update libidn to version 1.32
Rich Burridge <rich.burridge@oracle.com>
parents:
639
diff
changeset
|
3 |
This patch will be sent upstream. |
|
e403424d7512
23024487 Update libidn to version 1.32
Rich Burridge <rich.burridge@oracle.com>
parents:
639
diff
changeset
|
4 |
|
|
7083
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
5 |
--- lib/idna.h.orig 2016-10-10 08:33:08.794007533 +0000 |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
6 |
+++ lib/idna.h 2016-10-10 08:35:30.003511529 +0000 |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
7 |
@@ -43,7 +43,7 @@ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
8 |
# endif |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
9 |
|
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
10 |
# include <stddef.h> /* size_t */ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
11 |
-# include <idn-int.h> /* uint32_t */ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
12 |
+# include <idn/idn-int.h> /* uint32_t */ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
13 |
|
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
14 |
# ifdef __cplusplus |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
15 |
extern "C" |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
16 |
--- lib/pr29.h.orig 2016-10-10 08:33:17.881709287 +0000 |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
17 |
+++ lib/pr29.h 2016-10-10 08:35:43.197719107 +0000 |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
18 |
@@ -51,7 +51,7 @@ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
19 |
# include <stdlib.h> |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
20 |
|
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
21 |
/* Get uint32_t. */ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
22 |
-# include <idn-int.h> |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
23 |
+# include <idn/idn-int.h> |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
24 |
|
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
25 |
/* Error codes. */ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
26 |
typedef enum |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
27 |
--- lib/punycode.h.orig 2016-10-10 08:33:24.538122517 +0000 |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
28 |
+++ lib/punycode.h 2016-10-10 08:35:57.135867425 +0000 |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
29 |
@@ -87,7 +87,7 @@ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
30 |
/* Public interface (would normally go in its own .h file): */ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
31 |
|
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
32 |
#include <stddef.h> /* size_t */ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
33 |
-#include <idn-int.h> /* uint32_t */ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
34 |
+#include <idn/idn-int.h> /* uint32_t */ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
35 |
|
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
36 |
enum punycode_status |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
37 |
{
|
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
38 |
--- lib/stringprep.h.orig 2016-10-10 08:35:02.991412123 +0000 |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
39 |
+++ lib/stringprep.h 2016-10-10 08:28:52.349467569 +0000 |
|
5711
e403424d7512
23024487 Update libidn to version 1.32
Rich Burridge <rich.burridge@oracle.com>
parents:
639
diff
changeset
|
40 |
@@ -44,7 +44,7 @@ |
|
639
faa9a904b44b
6645310 idn includes <idn-int.h> instead of <idn/idn-int.h>
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
41 |
|
|
faa9a904b44b
6645310 idn includes <idn-int.h> instead of <idn/idn-int.h>
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
42 |
# include <stddef.h> /* size_t */ |
|
5711
e403424d7512
23024487 Update libidn to version 1.32
Rich Burridge <rich.burridge@oracle.com>
parents:
639
diff
changeset
|
43 |
# include <sys/types.h> /* ssize_t */ |
|
639
faa9a904b44b
6645310 idn includes <idn-int.h> instead of <idn/idn-int.h>
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
44 |
-# include <idn-int.h> /* uint32_t */ |
|
faa9a904b44b
6645310 idn includes <idn-int.h> instead of <idn/idn-int.h>
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
45 |
+# include <idn/idn-int.h> /* uint32_t */ |
|
faa9a904b44b
6645310 idn includes <idn-int.h> instead of <idn/idn-int.h>
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
46 |
|
|
faa9a904b44b
6645310 idn includes <idn-int.h> instead of <idn/idn-int.h>
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
47 |
# ifdef __cplusplus |
|
faa9a904b44b
6645310 idn includes <idn-int.h> instead of <idn/idn-int.h>
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
48 |
extern "C" |
|
7083
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
49 |
--- lib/tld.h.orig 2016-10-10 08:33:38.403769891 +0000 |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
50 |
+++ lib/tld.h 2016-10-10 08:36:29.358177481 +0000 |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
51 |
@@ -54,7 +54,7 @@ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
52 |
# include <stdlib.h> |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
53 |
|
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
54 |
/* Get uint32_t. */ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
55 |
-# include <idn-int.h> |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
56 |
+# include <idn/idn-int.h> |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
57 |
|
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
58 |
/* Interval of valid code points in the TLD. */ |
|
3821dc4d577f
24822543 idn/idna.h needs to fix an include path
Rich Burridge <rich.burridge@oracle.com>
parents:
5711
diff
changeset
|
59 |
struct Tld_table_element |