SecBSD/ports
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SecBSD's official ports repository

Browse source
This commit is contained in:
purplerain 2023-08-16 22:26:55 +00:00
commit 2c0afcbbf3
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
64331 changed files with 5339189 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
textproc/swish-e/patches/patch-src_merge_c Normal file
View file

@ -0,0 +1,32 @@
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;
}
}