author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Thu, 20 Oct 2016 23:00:49 -0700 | |
changeset 7144 | 75dd46f584db |
parent 5143 | 9b4a483bf8d9 |
permissions | -rw-r--r-- |
4903
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
1 |
Source: |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
2 |
Internal |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
3 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
4 |
Info: |
5143
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
5 |
This patch checks to see if _MAX_ALIGN_T has been defined. |
4903
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
6 |
|
5143
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
7 |
Status: This patch is Solaris specific. It will not be sent upstream. |
4903
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
8 |
|
5143
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
9 |
--- ORIGINAL/src/gl/stddef.in.h Sat Sep 26 05:02:10 2015 |
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
10 |
+++ gnutls-3.4.1/src/gl/stddef.in.h Wed Nov 4 14:17:07 2015 |
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
11 |
@@ -94,6 +94,7 @@ |
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
12 |
# else |
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
13 |
# define _GL_STDDEF_ALIGNAS(type) /* */ |
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
14 |
# endif |
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
15 |
+#ifndef _MAX_ALIGN_T |
4903
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
16 |
typedef union |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
17 |
{ |
5143
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
18 |
char *__p _GL_STDDEF_ALIGNAS (char *); |
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
19 |
@@ -101,6 +102,7 @@ |
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
20 |
long double __ld _GL_STDDEF_ALIGNAS (long double); |
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
21 |
long int __i _GL_STDDEF_ALIGNAS (long int); |
4903
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
22 |
} max_align_t; |
5143
9b4a483bf8d9
22242767 Upgrade GnuTLS to 3.4.6
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4903
diff
changeset
|
23 |
+#endif /* #ifndef _MAX_ALIGN_T */ |
4903
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
24 |
#endif |
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
25 |
|
6b60e63145ed
20367980 GNUTLS should be updated to version 3.4.1
Ann Lai <ann.lai@oracle.com>
parents:
diff
changeset
|
26 |
# endif /* _@GUARD_PREFIX@_STDDEF_H */ |