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/indri/patches/bigendian.patch
author Shawn Walker-Salas <shawn.walker@oracle.com>
Mon, 23 Nov 2015 15:33:43 -0800
changeset 5125 34cc580c62c2
parent 1626 8dee2dfe2525
permissions -rw-r--r--
21029732 PKG_CONFIG_PATH should be included in CONFIGURE_ENV and BUILD_ENV 21029735 shared-macros should define service manifest and method macros 21093823 sample-manifest should omit or comment "standard" directories and certain files 21144358 configure scripts usually detect wrong host for 64-bit builds 21157847 shared-macros.mk instructions have a typo for studio c99 mode 22067225 common make-rules desired for simplifying makefiles 22067806 transforms needs expanding for desktop services
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1626
8dee2dfe2525 PSARC/2013/232 Indri
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     1
 
Indri tries to define htonll and ntohll function which clash with solaris definitions
8dee2dfe2525 PSARC/2013/232 Indri
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     2
 
--- indri-5.4/contrib/lemur/include/lemur/lemur-compat.hpp	2013-10-08 00:25:53.513213629 +0200
8dee2dfe2525 PSARC/2013/232 Indri
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     3
 
+++ indri-5.4/contrib/lemur/include/lemur/lemur-compat.hpp	2013-10-08 00:25:34.165330285 +0200
8dee2dfe2525 PSARC/2013/232 Indri
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     4
 
@@ -212,6 +212,8 @@
8dee2dfe2525 PSARC/2013/232 Indri
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     5
 
 #endif
8dee2dfe2525 PSARC/2013/232 Indri
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     6
8dee2dfe2525 PSARC/2013/232 Indri
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     7
 
 #if defined(WORDS_BIGENDIAN)
8dee2dfe2525 PSARC/2013/232 Indri
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     8
 
+#undef htonll
8dee2dfe2525 PSARC/2013/232 Indri
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     9
 
+#undef ntohll
8dee2dfe2525 PSARC/2013/232 Indri
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    10
 
 inline UINT64 htonll( UINT64 native ) {
8dee2dfe2525 PSARC/2013/232 Indri
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    11
 
   return native;
8dee2dfe2525 PSARC/2013/232 Indri
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    12
 
 }
upstream/oracle/userland-gate