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/libnet/patches/libnet-types.h.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 650 e2fc423a4fd5
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
650
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
     1
 
--- libnet-1.1.5/include/libnet/libnet-types.h.orig	Sat Dec 17 16:12:12 2011
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
     2
 
+++ libnet-1.1.5/include/libnet/libnet-types.h	Sat Dec 17 16:12:36 2011
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
     3
 
@@ -32,8 +32,14 @@
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
     4
 
 #ifndef __LIBNET_TYPES_H
626
a1f09864c0a1 6881496 libnet is not Sun Studio compatible
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     5
 
 #define __LIBNET_TYPES_H
a1f09864c0a1 6881496 libnet is not Sun Studio compatible
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     6
650
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
     7
 
-/* libnet should be using the standard type names, so mapping standard
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
     8
 
- * to non-standard should not be necessary. */
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
     9
 
+/* Solaris has messed up POSIX nomenclature for these */
626
a1f09864c0a1 6881496 libnet is not Sun Studio compatible
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    10
 
+#ifndef __BIT_TYPES_DEFINED__
a1f09864c0a1 6881496 libnet is not Sun Studio compatible
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    11
 
+#define __BIT_TYPES_DEFINED__
650
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
    12
 
+typedef uint8_t  u_int8_t;
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
    13
 
+typedef uint16_t u_int16_t;
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
    14
 
+typedef uint32_t u_int32_t;
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
    15
 
+typedef uint64_t u_int64_t;
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
    16
 
+#endif
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
    17
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
    18
 
 #endif  /* __LIBNET_TYPES_H */
e2fc423a4fd5 PSARC 2011/399 Update libnet to 1.1.5
Rich Burridge <rich.burridge@oracle.com>
parents: 626
diff changeset 
    19
upstream/oracle/userland-gate