$OpenBSD: patch-src_merge_c,v 1.1 2021/07/04 14:31:46 tb Exp $

Fix namespace collision with libz

Index: src/merge.c
--- src/merge.c.orig
+++ src/merge.c
@@ -221,12 +221,12 @@ void merge_indexes( SWISH *sw_input, SWISH *sw_output 
 
                         /* Now, parse word's data */
                         s = worddata;
-                        tmpval = uncompress2(&s);     /* tfrequency */
-                        metaID = uncompress2(&s);     /* metaID */
+                        tmpval = swish_uncompress2(&s);     /* tfrequency */
+                        metaID = swish_uncompress2(&s);     /* metaID */
 
                         if (metaID)
                         {
-                            metadata_length = uncompress2(&s);
+                            metadata_length = swish_uncompress2(&s);
                         }
 
                         filenum = 0;
@@ -274,8 +274,8 @@ void merge_indexes( SWISH *sw_input, SWISH *sw_output 
                             if ( metadata_length == (s - start))
                             {
                                 filenum = 0;
-                                metaID = uncompress2(&s);
-                                metadata_length = uncompress2(&s);
+                                metaID = swish_uncompress2(&s);
+                                metadata_length = swish_uncompress2(&s);
                                 start = s;
                             }
                         }
