From 7050b7f928f5091a3cc5de1ac0b482a1138552cb Mon Sep 17 00:00:00 2001
From: Per Hedbor <ph@opera.com>
Date: Tue, 25 Feb 2014 14:10:53 +0100
Subject: [PATCH] Moved things that are never used outside cpp.c from cpp.h
---
src/cpp.c | 21 ++++++++++++++++++++-
src/cpp.h | 22 ----------------------
2 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/src/cpp.c b/src/cpp.c
index 52c9c85629..666f2ff679 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -51,6 +51,18 @@
#define DEF_ARG_NEED_COMMA 0x800000
#define DEF_ARG_MASK 0x0fffff
+struct define_part;
+struct define_argument;
+struct define;
+struct cpp;
+
+
+/* Return true if compat version is equal or less than MAJOR.MINOR */
+#define CPP_TEST_COMPAT(THIS,MAJOR,MINOR) \
+ (THIS->compat_major < (MAJOR) || \
+ (THIS->compat_major == (MAJOR) && \
+ THIS->compat_minor <= (MINOR)))
+
#if 0
#define CALC_DUMPPOS(X) DUMPPOS(X)
#else /* !0 */
@@ -134,6 +146,13 @@ struct cpp
INT_TYPE picky_cpp, keep_comments, dependencies_fail;
};
+static void cpp_error(struct cpp *this, const char *err);
+static void cpp_error_vsprintf (struct cpp *this, const char *fmt,
+ va_list args);
+static void cpp_error_sprintf(struct cpp *this, const char *fmt, ...);
+static void cpp_handle_exception(struct cpp *this,
+ const char *cpp_error_fmt, ...);
+static void cpp_warning(struct cpp *this, const char *cpp_warn_fmt, ...);
struct define *defined_macro =0;
static struct pike_string *binary_findstring1(p_wchar1 *str, ptrdiff_t len);
@@ -1966,7 +1985,7 @@ static struct pike_string *filter_bom(struct pike_string *data)
return(data);
}
-void free_one_define(struct hash_entry *h)
+static void free_one_define(struct hash_entry *h)
{
int e;
struct define *d=BASEOF(h, define, link);
diff --git a/src/cpp.h b/src/cpp.h
index d66568b43c..700cc813e1 100644
--- a/src/cpp.h
+++ b/src/cpp.h
@@ -13,31 +13,9 @@ struct hash_entry;
#endif
/* Prototypes begin here */
-struct define_part;
-struct define_argument;
-struct define;
-struct cpp;
-static void cpp_error(struct cpp *this, const char *err);
-static void cpp_error_vsprintf (struct cpp *this, const char *fmt,
- va_list args);
-static void cpp_error_sprintf(struct cpp *this, const char *fmt, ...);
-static void cpp_handle_exception(struct cpp *this,
- const char *cpp_error_fmt, ...);
-static void cpp_warning(struct cpp *this, const char *cpp_warn_fmt, ...);
-void PUSH_STRING(char *str,
- INT32 len,
- dynamic_buffer *buf);
-void free_one_define(struct hash_entry *h);
void f_cpp(INT32 args);
void init_cpp(void);
void add_predefine(char *s);
void exit_cpp(void);
/* Prototypes end here */
-
-/* Return true if compat version is equal or less than MAJOR.MINOR */
-#define CPP_TEST_COMPAT(THIS,MAJOR,MINOR) \
- (THIS->compat_major < (MAJOR) || \
- (THIS->compat_major == (MAJOR) && \
- THIS->compat_minor <= (MINOR)))
-
#endif
--
GitLab