Projects
openEuler:22.03:LTS:LoongArch
ctags
_service:tar_scm_kernel_repo:rename-the-local-_...
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:tar_scm_kernel_repo:rename-the-local-__unused__-to-__ctags_unused__.patch of Package ctags
From ead8a3f1f09ca56716610cbd76fde791f0171253 Mon Sep 17 00:00:00 2001 From: yixiangzhike <yixiangzhike007@163.com> Date: Fri, 13 Aug 2021 12:32:32 +0800 Subject: [PATCH] rename the local __unused__ to __ctags_unused__ Ctags local macro __unused__ overwrites the built-in meaning of gcc. As a result, ctags fails to be compiled using glibc-2.34. Now, rename the local __unused__ to __ctags_unused__. --- c.c | 4 ++-- eiffel.c | 2 +- general.h | 4 ++-- lregex.c | 30 +++++++++++++++--------------- lua.c | 2 +- main.c | 2 +- options.c | 24 ++++++++++++------------ parse.c | 2 +- python.c | 2 +- routines.c | 2 +- 10 files changed, 37 insertions(+), 37 deletions(-) diff --git a/c.c b/c.c index 0cf0a14..4614ba7 100644 --- a/c.c +++ b/c.c @@ -619,7 +619,7 @@ static const char *keywordString (const keywordId keyword) return name; } -static void __unused__ pt (tokenInfo *const token) +static void __ctags_unused__ pt (tokenInfo *const token) { if (isType (token, TOKEN_NAME)) printf ("type: %-12s: %-13s line: %lu\n", @@ -634,7 +634,7 @@ static void __unused__ pt (tokenInfo *const token) tokenString (token->type), token->lineNumber); } -static void __unused__ ps (statementInfo *const st) +static void __ctags_unused__ ps (statementInfo *const st) { unsigned int i; printf ("scope: %s decl: %s gotName: %s gotParenName: %s\n", diff --git a/eiffel.c b/eiffel.c index b504ac3..b569d8b 100644 --- a/eiffel.c +++ b/eiffel.c @@ -803,7 +803,7 @@ static void findKeyword (tokenInfo *const token, const keywordId keyword) static boolean parseType (tokenInfo *const token); -static void parseGeneric (tokenInfo *const token, boolean declaration __unused__) +static void parseGeneric (tokenInfo *const token, boolean declaration __ctags_unused__) { unsigned int depth = 0; #ifdef TYPE_REFERENCE_TOOL diff --git a/general.h b/general.h index 2d1d629..92bb20d 100644 --- a/general.h +++ b/general.h @@ -57,10 +57,10 @@ * to prevent warnings about unused variables. */ #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) && !defined (__GNUG__) -# define __unused__ __attribute__((unused)) +# define __ctags_unused__ __attribute__((unused)) # define __printf__(s,f) __attribute__((format (printf, s, f))) #else -# define __unused__ +# define __ctags_unused__ # define __printf__(s,f) #endif diff --git a/lregex.c b/lregex.c index f76aac0..228d9fc 100644 --- a/lregex.c +++ b/lregex.c @@ -538,11 +538,11 @@ extern void findRegexTags (void) #endif /* HAVE_REGEX */ extern void addTagRegex ( - const langType language __unused__, - const char* const regex __unused__, - const char* const name __unused__, - const char* const kinds __unused__, - const char* const flags __unused__) + const langType language __ctags_unused__, + const char* const regex __ctags_unused__, + const char* const name __ctags_unused__, + const char* const kinds __ctags_unused__, + const char* const flags __ctags_unused__) { #ifdef HAVE_REGEX Assert (regex != NULL); @@ -564,10 +564,10 @@ extern void addTagRegex ( } extern void addCallbackRegex ( - const langType language __unused__, - const char* const regex __unused__, - const char* const flags __unused__, - const regexCallback callback __unused__) + const langType language __ctags_unused__, + const char* const regex __ctags_unused__, + const char* const flags __ctags_unused__, + const regexCallback callback __ctags_unused__) { #ifdef HAVE_REGEX Assert (regex != NULL); @@ -581,7 +581,7 @@ extern void addCallbackRegex ( } extern void addLanguageRegex ( - const langType language __unused__, const char* const regex __unused__) + const langType language __ctags_unused__, const char* const regex __ctags_unused__) { #ifdef HAVE_REGEX if (! regexBroken) @@ -602,7 +602,7 @@ extern void addLanguageRegex ( */ extern boolean processRegexOption (const char *const option, - const char *const parameter __unused__) + const char *const parameter __ctags_unused__) { boolean handled = FALSE; const char* const dash = strchr (option, '-'); @@ -624,7 +624,7 @@ extern boolean processRegexOption (const char *const option, return handled; } -extern void disableRegexKinds (const langType language __unused__) +extern void disableRegexKinds (const langType language __ctags_unused__) { #ifdef HAVE_REGEX if (language <= SetUpper && Sets [language].count > 0) @@ -639,8 +639,8 @@ extern void disableRegexKinds (const langType language __unused__) } extern boolean enableRegexKind ( - const langType language __unused__, - const int kind __unused__, const boolean mode __unused__) + const langType language __ctags_unused__, + const int kind __ctags_unused__, const boolean mode __ctags_unused__) { boolean result = FALSE; #ifdef HAVE_REGEX @@ -660,7 +660,7 @@ extern boolean enableRegexKind ( return result; } -extern void printRegexKinds (const langType language __unused__, boolean indent __unused__) +extern void printRegexKinds (const langType language __ctags_unused__, boolean indent __ctags_unused__) { #ifdef HAVE_REGEX if (language <= SetUpper && Sets [language].count > 0) diff --git a/lua.c b/lua.c index d385544..48d8ff8 100644 --- a/lua.c +++ b/lua.c @@ -37,7 +37,7 @@ static kindOption LuaKinds [] = { */ /* for debugging purposes */ -static void __unused__ print_string (char *p, char *q) +static void __ctags_unused__ print_string (char *p, char *q) { for ( ; p != q; p++) fprintf (errout, "%c", *p); diff --git a/main.c b/main.c index 79948fe..0811882 100644 --- a/main.c +++ b/main.c @@ -522,7 +522,7 @@ static void makeTags (cookedArgs *args) * Start up code */ -extern int main (int __unused__ argc, char **argv) +extern int main (int __ctags_unused__ argc, char **argv) { cookedArgs *args; #ifdef VMS diff --git a/options.c b/options.c index d26627f..aa6242e 100644 --- a/options.c +++ b/options.c @@ -730,7 +730,7 @@ static void processEtagsInclude ( } static void processExcludeOption ( - const char *const option __unused__, const char *const parameter) + const char *const option __ctags_unused__, const char *const parameter) { const char *const fileName = parameter + 1; if (parameter [0] == '\0') @@ -867,7 +867,7 @@ static void processFieldsOption ( } static void processFilterTerminatorOption ( - const char *const option __unused__, const char *const parameter) + const char *const option __ctags_unused__, const char *const parameter) { freeString (&Option.filterTerminator); Option.filterTerminator = stringCopy (parameter); @@ -930,8 +930,8 @@ static void printProgramIdentification (void) } static void processHelpOption ( - const char *const option __unused__, - const char *const parameter __unused__) + const char *const option __ctags_unused__, + const char *const parameter __ctags_unused__) { printProgramIdentification (); putchar ('\n'); @@ -1139,8 +1139,8 @@ static void processLanguagesOption ( } static void processLicenseOption ( - const char *const option __unused__, - const char *const parameter __unused__) + const char *const option __ctags_unused__, + const char *const parameter __ctags_unused__) { printProgramIdentification (); puts (""); @@ -1166,8 +1166,8 @@ static void processListKindsOption ( } static void processListMapsOption ( - const char *const __unused__ option, - const char *const __unused__ parameter) + const char *const __ctags_unused__ option, + const char *const __ctags_unused__ parameter) { if (parameter [0] == '\0' || strcasecmp (parameter, "all") == 0) printLanguageMaps (LANG_AUTO); @@ -1183,8 +1183,8 @@ static void processListMapsOption ( } static void processListLanguagesOption ( - const char *const option __unused__, - const char *const parameter __unused__) + const char *const option __ctags_unused__, + const char *const parameter __ctags_unused__) { printLanguageList (); exit (0); @@ -1358,8 +1358,8 @@ static void processIgnoreOption (const char *const list) } static void processVersionOption ( - const char *const option __unused__, - const char *const parameter __unused__) + const char *const option __ctags_unused__, + const char *const parameter __ctags_unused__) { printProgramIdentification (); exit (0); diff --git a/parse.c b/parse.c index 0b5e2c3..0a8160b 100644 --- a/parse.c +++ b/parse.c @@ -376,7 +376,7 @@ extern void freeParserResources (void) */ extern void processLanguageDefineOption ( - const char *const option, const char *const parameter __unused__) + const char *const option, const char *const parameter __ctags_unused__) { #ifdef HAVE_REGEX if (parameter [0] == '\0') diff --git a/python.c b/python.c index 5fdf31b..96dad5f 100644 --- a/python.c +++ b/python.c @@ -135,7 +135,7 @@ static boolean isIdentifierCharacter (int c) * extract all relevant information and create a tag. */ static void makeFunctionTag (vString *const function, - vString *const parent, int is_class_parent, const char *arglist __unused__) + vString *const parent, int is_class_parent, const char *arglist __ctags_unused__) { tagEntryInfo tag; initTagEntry (&tag, vStringValue (function)); diff --git a/routines.c b/routines.c index 8ebe2e0..4bb5c90 100644 --- a/routines.c +++ b/routines.c @@ -526,7 +526,7 @@ static boolean isPathSeparator (const int c) #if ! defined (HAVE_STAT_ST_INO) -static void canonicalizePath (char *const path __unused__) +static void canonicalizePath (char *const path __ctags_unused__) { #if defined (MSDOS_STYLE_PATH) char *p; -- 1.8.3.1
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.