From 5de269ea9fc36b7b725ca6d49fcd21569f5dd6b4 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@lysator.liu.se>
Date: Mon, 28 May 2012 20:21:09 +0200
Subject: [PATCH] Fixed some PMOD_EXPORT inconsistencies introduced by
66d928b3c.
---
src/stralloc.c | 15 +++++++--------
src/stralloc.h | 5 ++---
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/stralloc.c b/src/stralloc.c
index 84ae981386..567f55b33b 100644
--- a/src/stralloc.c
+++ b/src/stralloc.c
@@ -176,8 +176,7 @@ PMOD_EXPORT p_wchar2 index_shared_string(struct pike_string *s,
return generic_extract(s->str,s->size_shift,pos);
}
-PMOD_EXPORT void low_set_index(struct pike_string *s, ptrdiff_t pos,
- int value)
+void low_set_index(struct pike_string *s, ptrdiff_t pos, int value)
{
#ifdef PIKE_DEBUG
if(pos > s->len || pos<0) {
@@ -421,12 +420,12 @@ static INLINE struct pike_string *internal_findstring(const char *s,
return 0; /* not found */
}
-PMOD_EXPORT struct pike_string *binary_findstring(const char *foo, ptrdiff_t l)
+struct pike_string *binary_findstring(const char *foo, ptrdiff_t l)
{
return internal_findstring(foo, l, 0, StrHash(foo,l));
}
-PMOD_EXPORT struct pike_string *findstring(const char *foo)
+struct pike_string *findstring(const char *foo)
{
return binary_findstring(foo, strlen(foo));
}
@@ -1442,8 +1441,8 @@ void dump_stralloc_strings(void)
/*** String compare functions ***/
/* does not take locale into account */
-PMOD_EXPORT int low_quick_binary_strcmp(char *a, ptrdiff_t alen,
- char *b, ptrdiff_t blen)
+int low_quick_binary_strcmp(char *a, ptrdiff_t alen,
+ char *b, ptrdiff_t blen)
{
int tmp;
if(alen > blen)
@@ -1630,8 +1629,8 @@ PMOD_EXPORT ptrdiff_t my_strcmp(struct pike_string *a,struct pike_string *b)
}
}
-PMOD_EXPORT struct pike_string *realloc_unlinked_string(struct pike_string *a,
- ptrdiff_t size)
+struct pike_string *realloc_unlinked_string(struct pike_string *a,
+ ptrdiff_t size)
{
struct pike_string *r = NULL;
diff --git a/src/stralloc.h b/src/stralloc.h
index 76056abea0..7665d10e50 100644
--- a/src/stralloc.h
+++ b/src/stralloc.h
@@ -83,7 +83,7 @@ struct string_builder
#define QUOTE_BREAK_AT_LF 2 /* Break after linefeed */
#ifdef PIKE_DEBUG
-PMOD_EXPORT struct pike_string *debug_findstring(const struct pike_string *foo);
+struct pike_string *debug_findstring(const struct pike_string *foo);
#endif
#define free_string(s) do{ \
@@ -249,8 +249,7 @@ PMOD_EXPORT extern struct pike_string *empty_pike_string;
/* Prototypes begin here */
PMOD_EXPORT p_wchar2 index_shared_string(struct pike_string *s,
ptrdiff_t pos);
-void low_set_index(struct pike_string *s, ptrdiff_t pos,
- int value);
+void low_set_index(struct pike_string *s, ptrdiff_t pos, int value);
PMOD_EXPORT struct pike_string *debug_check_size_shift(struct pike_string *a,int shift);
CONVERT(0,1)
CONVERT(0,2)
--
GitLab