8000 Revert "PGPRO-6148: Fix windows build due to due to vanilla 089480c077." · postgrespro/shared_ispell@61d9005 · GitHub
[go: up one dir, main page]

Skip to content

Commit 61d9005

Browse files
committed
Revert "PGPRO-6148: Fix windows build due to due to vanilla 089480c077."
We don't want windows support in STD. This reverts commit f663a37. Tags: shared_ispell
1 parent f663a37 commit 61d9005

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

shared_ispell--1.1.0.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
CREATE FUNCTION shared_ispell_init(internal)
22
RETURNS internal
3-
AS 'MODULE_PATHNAME', 'contrib_dispell_init'
3+
AS 'MODULE_PATHNAME', 'dispell_init'
44
LANGUAGE C IMMUTABLE;
55

66
CREATE FUNCTION shared_ispell_lexize(internal,internal,internal,internal)
77
RETURNS internal
8-
AS 'MODULE_PATHNAME', 'contrib_dispell_lexize'
8+
AS 'MODULE_PATHNAME', 'dispell_lexize'
99
LANGUAGE C IMMUTABLE;
1010

1111
CREATE FUNCTION shared_ispell_reset()

src/shared_ispell.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
*
4343
* ===== dictionary reinit after reset (backend) =====
4444
*
45-
* contrib_dispell_lexize
45+
* dispell_lexize
4646
* -> timestamp of lookup < last reset
4747
* -> init_shared_dict
48-
* (see contrib_dispell_init above)
48+
* (see dispell_init above)
4949
* -> SharedNINormalizeWord
5050
*/
5151

@@ -210,8 +210,8 @@ ispell_shmem_startup()
210210
* This is called from backends that are looking up for a shared dictionary
211211
* definition using a filename with dictionary / affixes.
212212
*
213-
* This is called through contrib_dispell_init() which is responsible
214-
* for proper locking of the shared memory (using SegmentInfo->lock).
213+
* This is called through dispell_init() which is responsible for proper locking
214+
* of the shared memory (using SegmentInfo->lock).
215215
*/
216216
static SharedIspellDict *
217217
get_shared_dict(char *words, char *affixes)
@@ -233,8 +233,8 @@ get_shared_dict(char *words, char *affixes)
233233
* This is called from backends that are looking up for a list of stop words
234234
* using a filename of the list.
235235
*
236-
* This is called through dispell_init() which is responsible
237-
* for proper locking of the shared memory (using SegmentInfo->lock).
236+
* This is called through dispell_init() which is responsible for proper locking
237+
* of the shared memory (using SegmentInfo->lock).
238238
*/
239239
static SharedStopList *
240240
get_shared_stop_list(char *stop)
@@ -285,8 +285,8 @@ clean_dict_affix(IspellDict *dict)
285285
* shared segment. If not then loads the dictionary (word list).
286286
* Affix list is loaded to a current backend process.
287287
*
288-
* This is called through dispell_init() which is responsible
289-
* for proper locking of the shared memory (using SegmentInfo->lock).
288+
* This is called through dispell_init() which is responsible for proper locking
289+
* of the shared memory (using SegmentInfo->lock).
290290
*/
291291
static void
292292
init_shared_dict(DictInfo *info, MemoryContext infoCntx,
@@ -429,8 +429,8 @@ init_shared_dict(DictInfo *info, MemoryContext infoCntx,
429429
info->infoCntx = infoCntx;
430430
}
431431

432-
PG_FUNCTION_INFO_V1(contrib_dispell_init);
433-
PG_FUNCTION_INFO_V1(contrib_dispell_lexize);
432+
PG_FUNCTION_INFO_V1(dispell_init);
433+
PG_FUNCTION_INFO_V1(dispell_lexize);
434434
PG_FUNCTION_INFO_V1(dispell_reset);
435435
PG_FUNCTION_INFO_V1(dispell_mem_available);
436436
PG_FUNCTION_INFO_V1(dispell_mem_used);
@@ -513,7 +513,7 @@ dispell_mem_used(PG_FUNCTION_ARGS)
513513
* context.
514514
*/
515515
Datum
516-
contrib_dispell_init(PG_FUNCTION_ARGS)
516+
dispell_init(PG_FUNCTION_ARGS)
517517
{
518518
List *dictoptions = (List *) PG_GETARG_POINTER(0);
519519
char *dictFile = NULL,
@@ -524,7 +524,7 @@ contrib_dispell_init(PG_FUNCTION_ARGS)
524524
stoploaded = false;
525525
ListCell *l;
526526

527-
/* this is the result passed to contrib_dispell_lexize */
527+
/* this is the result passed to dispell_lexize */
528528
DictInfo *info = (DictInfo *) palloc0(sizeof(DictInfo));
529529

530530
foreach(l, dictoptions)
@@ -599,7 +599,7 @@ contrib_dispell_init(PG_FUNCTION_ARGS)
599599
}
600600

601601
Datum
602-
contrib_dispell_lexize(PG_FUNCTION_ARGS)
602+
dispell_lexize(PG_FUNCTION_ARGS)
603603
{
604604
DictInfo *info = (DictInfo *) PG_GETARG_POINTER(0);
605605
char *in = (char *) PG_GETARG_POINTER(1);

0 commit comments

Comments
 (0)
0