changeset 5215 | 7fe3e5b43e6a |
parent 5214 | f6336578f3e5 |
child 5216 | fdd262355907 |
5214:f6336578f3e5 | 5215:7fe3e5b43e6a |
---|---|
1 Indri tries to define htonll and ntohll function which clash with solaris definitions |
|
2 --- indri-5.4/contrib/lemur/include/lemur/lemur-compat.hpp 2013-10-08 00:25:53.513213629 +0200 |
|
3 +++ indri-5.4/contrib/lemur/include/lemur/lemur-compat.hpp 2013-10-08 00:25:34.165330285 +0200 |
|
4 @@ -212,6 +212,8 @@ |
|
5 #endif |
|
6 |
|
7 #if defined(WORDS_BIGENDIAN) |
|
8 +#undef htonll |
|
9 +#undef ntohll |
|
10 inline UINT64 htonll( UINT64 native ) { |
|
11 return native; |
|
12 } |