| author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
| Wed, 15 Mar 2017 10:30:53 -0700 | |
| branch | s11u3-sru |
| changeset 7925 | 9029178fe4cd |
| parent 7287 | 147d8c6e4c81 |
| permissions | -rw-r--r-- |
|
7287
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
1 |
Source: |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
2 |
Internal |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
3 |
|
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
4 |
Info: |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
5 |
This patch checks to see if _MAX_ALIGN_T has been defined. |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
6 |
|
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
7 |
Status: This patch is Solaris specific. It will not be sent upstream. |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
8 |
|
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
9 |
--- ORIGINAL/src/gl/stddef.in.h Sat Sep 26 05:02:10 2015 |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
10 |
+++ gnutls-3.4.1/src/gl/stddef.in.h Wed Nov 4 14:17:07 2015 |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
11 |
@@ -94,6 +94,7 @@ |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
12 |
# else |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
13 |
# define _GL_STDDEF_ALIGNAS(type) /* */ |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
14 |
# endif |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
15 |
+#ifndef _MAX_ALIGN_T |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
16 |
typedef union |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
17 |
{
|
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
18 |
char *__p _GL_STDDEF_ALIGNAS (char *); |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
19 |
@@ -101,6 +102,7 @@ |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
20 |
long double __ld _GL_STDDEF_ALIGNAS (long double); |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
21 |
long int __i _GL_STDDEF_ALIGNAS (long int); |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
22 |
} max_align_t; |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
23 |
+#endif /* #ifndef _MAX_ALIGN_T */ |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
24 |
#endif |
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
25 |
|
|
147d8c6e4c81
23210168 Upgrade Gnutls-3 to 3.4.9
Ivo Raisr <ivo.raisr@oracle.com>
parents:
diff
changeset
|
26 |
# endif /* _@GUARD_PREFIX@_STDDEF_H */ |