Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/trousers/patches/include_trousers_types.h.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 06 Apr 2017 11:44:41 -0700
changeset 7843 56b5a2b1ab27
parent 5941 db8aa9865e9f
permissions -rw-r--r--
25141953 nping --icmp dumps core on SPARC
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5941
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
     1
 
# Include Solaris as defining const keyword to remove compiler warnings.
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
     2
 
# Solaris-specific, but suitable for use upstream.
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
     3
 
# This change was implemented in-house.
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
     4
 
#
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
     5
 
--- src/include/trousers_types.h	2010-09-10 12:50:27.000000000 -0700
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
     6
 
+++ src/include/trousers_types.h	2012-04-23 13:53:43.275840000 -0700
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
     7
 
@@ -118,9 +118,9 @@
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
     8
 
 	BYTE *encData;
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
     9
 
 } TSS_KEY;
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
    10
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
    11
 
-#if (defined (__linux) || defined (linux) || defined (SOLARIS) || defined (__GLIBC__))
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
    12
 
+#if (defined (__linux) || defined (linux) || defined (__GLIBC__))
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
    13
 
 #define BSD_CONST
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
    14
 
-#elif (defined (__OpenBSD__) || defined (__FreeBSD__))
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
    15
 
+#elif (defined (__OpenBSD__) || defined (__FreeBSD__) || defined (SOLARIS))
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
    16
 
 #define BSD_CONST const
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
    17
 
 #endif
db8aa9865e9f 15776792 Upgrade TrouSerS TPM library to 0.3.13
Dan Anderson <dan.anderson@oracle.com>
parents:
diff changeset 
    18
upstream/oracle/userland-gate