diff options
| author | Sergey Pisarchik <pisarchik@mapswithme.com> | 2014-04-07 16:30:38 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:14:30 +0300 |
| commit | e3bd8a6853c5b0df9b0c92b469c1dadddde356c4 (patch) | |
| tree | 64b66b95b570ba5e937c4383c0c5b7bd0e9c34a0 /3party/robust | |
| parent | 6dcf2791ed573b297530e3c7cbf8c71611921685 (diff) | |
[Tizen] commented unused function because of compile error:
/omim-tizen-emulator-debug/out/debug/libzlib.a(compress.o): In function `compress':
omim/3party/zlib/compress.c:67: multiple definition of `compress'
omim-tizen-emulator-debug/out/debug/libgeometry.a(robust_orientation.o):/Users/Sergey/omim/geometry/../3party/robust/predicates.c:1297: first defined here
Diffstat (limited to '3party/robust')
| -rw-r--r-- | 3party/robust/predicates.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/3party/robust/predicates.c b/3party/robust/predicates.c index 5f9a5c2328..734848093d 100644 --- a/3party/robust/predicates.c +++ b/3party/robust/predicates.c @@ -1293,8 +1293,15 @@ int scale_expansion_zeroelim(int elen, REAL * e, REAL b, REAL * h) /* e and h /* */ /*****************************************************************************/ -int compress(int elen, REAL * e, REAL * h) /* e and h may be the same. */ -{ +/* +commented because of compile error: + +/omim-tizen-emulator-debug/out/debug/libzlib.a(compress.o): In function `compress': +omim/3party/zlib/compress.c:67: multiple definition of `compress' +omim-tizen-emulator-debug/out/debug/libgeometry.a(robust_orientation.o):/Users/Sergey/omim/geometry/../3party/robust/predicates.c:1297: first defined here + +int compress(int elen, REAL * e, REAL * h) */ /* e and h may be the same. */ +/*{ REAL Q, q; INEXACT REAL Qnew; int eindex, hindex; @@ -1325,7 +1332,7 @@ int compress(int elen, REAL * e, REAL * h) /* e and h ma } h[top] = Q; return top + 1; -} +}*/ /*****************************************************************************/ /* */ |