]> git.pld-linux.org Git - packages/ctags.git/blame - attr.patch
projects / packages / ctags.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
fix build with modern gcc/glibc
[packages/ctags.git] / attr.patch
CommitLineData
18393bca
JP		 1diff -ur ctags-5.8.orig/c.c ctags-5.8/c.c
2--- ctags-5.8.orig/c.c 2023-01-29 21:39:39.092029264 +0100
3+++ ctags-5.8/c.c 2023-01-29 21:56:25.586429350 +0100
4@@ -619,7 +619,7 @@
5 return name;
6 }
7
8-static void __unused__ pt (tokenInfo *const token)
9+static void ctags_attr_unused pt (tokenInfo *const token)
10 {
11 if (isType (token, TOKEN_NAME))
12 printf ("type: %-12s: %-13s line: %lu\n",
13@@ -634,7 +634,7 @@
14 tokenString (token->type), token->lineNumber);
15 }
16
17-static void __unused__ ps (statementInfo *const st)
18+static void ctags_attr_unused ps (statementInfo *const st)
19 {
20 unsigned int i;
21 printf ("scope: %s decl: %s gotName: %s gotParenName: %s\n",
22diff -ur ctags-5.8.orig/debug.h ctags-5.8/debug.h
23--- ctags-5.8.orig/debug.h 2007-06-24 21:57:09.000000000 +0200
24+++ ctags-5.8/debug.h 2023-01-29 21:54:58.442301695 +0100
25@@ -58,7 +58,7 @@
26 * Function prototypes
27 */
28 extern void lineBreak (void);
29-extern void debugPrintf (const enum eDebugLevels level, const char *const format, ...) __printf__ (2, 3);
30+extern void debugPrintf (const enum eDebugLevels level, const char *const format, ...) ctags_attr_printf (2, 3);
31 extern void debugPutc (const int level, const int c);
32 extern void debugParseNest (const boolean increase, const unsigned int level);
33 extern void debugCppNest (const boolean begin, const unsigned int level);
34diff -ur ctags-5.8.orig/eiffel.c ctags-5.8/eiffel.c
35--- ctags-5.8.orig/eiffel.c 2023-01-29 21:39:39.095362496 +0100
36+++ ctags-5.8/eiffel.c 2023-01-29 21:56:12.003492590 +0100
37@@ -807,7 +807,7 @@
38
39 static boolean parseType (tokenInfo *const token);
40
41-static void parseGeneric (tokenInfo *const token, boolean declaration __unused__)
42+static void parseGeneric (tokenInfo *const token, boolean declaration ctags_attr_unused)
43 {
44 unsigned int depth = 0;
45 #ifdef TYPE_REFERENCE_TOOL
46diff -ur ctags-5.8.orig/general.h ctags-5.8/general.h
47--- ctags-5.8.orig/general.h 2007-05-03 05:21:08.000000000 +0200
48+++ ctags-5.8/general.h 2023-01-29 21:54:14.060256268 +0100
49@@ -57,11 +57,11 @@
50 * to prevent warnings about unused variables.
51 */
52 #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) && !defined (__GNUG__)
53-# define __unused__ __attribute__((unused))
54-# define __printf__(s,f) __attribute__((format (printf, s, f)))
55+# define ctags_attr_unused __attribute__((unused))
56+# define ctags_attr_printf(s,f) __attribute__((format (printf, s, f)))
57 #else
58-# define __unused__
59-# define __printf__(s,f)
60+# define ctags_attr_unused
61+# define ctags_attr_printf(s,f)
62 #endif
63
64 /*
65diff -ur ctags-5.8.orig/lregex.c ctags-5.8/lregex.c
66--- ctags-5.8.orig/lregex.c 2023-01-29 21:39:39.082029568 +0100
67+++ ctags-5.8/lregex.c 2023-01-29 21:56:52.985628533 +0100
68@@ -538,11 +538,11 @@
69 #endif /* HAVE_REGEX */
70
71 extern void addTagRegex (
72- const langType language __unused__,
73- const char* const regex __unused__,
74- const char* const name __unused__,
75- const char* const kinds __unused__,
76- const char* const flags __unused__)
77+ const langType language ctags_attr_unused,
78+ const char* const regex ctags_attr_unused,
79+ const char* const name ctags_attr_unused,
80+ const char* const kinds ctags_attr_unused,
81+ const char* const flags ctags_attr_unused)
82 {
83 #ifdef HAVE_REGEX
84 Assert (regex != NULL);
85@@ -564,10 +564,10 @@
86 }
87
88 extern void addCallbackRegex (
89- const langType language __unused__,
90- const char* const regex __unused__,
91- const char* const flags __unused__,
92- const regexCallback callback __unused__)
93+ const langType language ctags_attr_unused,
94+ const char* const regex ctags_attr_unused,
95+ const char* const flags ctags_attr_unused,
96+ const regexCallback callback ctags_attr_unused)
97 {
98 #ifdef HAVE_REGEX
99 Assert (regex != NULL);
100@@ -581,7 +581,7 @@
101 }
102
103 extern void addLanguageRegex (
104- const langType language __unused__, const char* const regex __unused__)
105+ const langType language ctags_attr_unused, const char* const regex ctags_attr_unused)
106 {
107 #ifdef HAVE_REGEX
108 if (! regexBroken)
109@@ -602,7 +602,7 @@
110 */
111
112 extern boolean processRegexOption (const char *const option,
113- const char *const parameter __unused__)
114+ const char *const parameter ctags_attr_unused)
115 {
116 boolean handled = FALSE;
117 const char* const dash = strchr (option, '-');
118@@ -624,7 +624,7 @@
119 return handled;
120 }
121
122-extern void disableRegexKinds (const langType language __unused__)
123+extern void disableRegexKinds (const langType language ctags_attr_unused)
124 {
125 #ifdef HAVE_REGEX
126 if (language <= SetUpper && Sets [language].count > 0)
127@@ -639,8 +639,8 @@
128 }
129
130 extern boolean enableRegexKind (
131- const langType language __unused__,
132- const int kind __unused__, const boolean mode __unused__)
133+ const langType language ctags_attr_unused,
134+ const int kind ctags_attr_unused, const boolean mode ctags_attr_unused)
135 {
136 boolean result = FALSE;
137 #ifdef HAVE_REGEX
138@@ -660,7 +660,7 @@
139 return result;
140 }
141
142-extern void printRegexKinds (const langType language __unused__, boolean indent __unused__)
143+extern void printRegexKinds (const langType language ctags_attr_unused, boolean indent ctags_attr_unused)
144 {
145 #ifdef HAVE_REGEX
146 if (language <= SetUpper && Sets [language].count > 0)
147diff -ur ctags-5.8.orig/lua.c ctags-5.8/lua.c
148--- ctags-5.8.orig/lua.c 2006-10-12 05:26:40.000000000 +0200
149+++ ctags-5.8/lua.c 2023-01-29 21:56:09.113576927 +0100
150@@ -37,7 +37,7 @@
151 */
152
153 /* for debugging purposes */
154-static void __unused__ print_string (char *p, char *q)
155+static void ctags_attr_unused print_string (char *p, char *q)
156 {
157 for ( ; p != q; p++)
158 fprintf (errout, "%c", *p);
159diff -ur ctags-5.8.orig/main.c ctags-5.8/main.c
160--- ctags-5.8.orig/main.c 2007-06-07 06:35:21.000000000 +0200
161+++ ctags-5.8/main.c 2023-01-29 21:56:29.099660063 +0100
162@@ -522,7 +522,7 @@
163 * Start up code
164 */
165
166-extern int main (int __unused__ argc, char **argv)
167+extern int main (int ctags_attr_unused argc, char **argv)
168 {
169 cookedArgs *args;
170 #ifdef VMS
171diff -ur ctags-5.8.orig/options.c ctags-5.8/options.c
172--- ctags-5.8.orig/options.c 2007-09-05 04:00:44.000000000 +0200
173+++ ctags-5.8/options.c 2023-01-29 21:55:59.927178263 +0100
174@@ -730,7 +730,7 @@
175 }
176
177 static void processExcludeOption (
178- const char *const option __unused__, const char *const parameter)
179+ const char *const option ctags_attr_unused, const char *const parameter)
180 {
181 const char *const fileName = parameter + 1;
182 if (parameter [0] == '\0')
183@@ -867,7 +867,7 @@
184 }
185
186 static void processFilterTerminatorOption (
187- const char *const option __unused__, const char *const parameter)
188+ const char *const option ctags_attr_unused, const char *const parameter)
189 {
190 freeString (&Option.filterTerminator);
191 Option.filterTerminator = stringCopy (parameter);
192@@ -930,8 +930,8 @@
193 }
194
195 static void processHelpOption (
196- const char *const option __unused__,
197- const char *const parameter __unused__)
198+ const char *const option ctags_attr_unused,
199+ const char *const parameter ctags_attr_unused)
200 {
201 printProgramIdentification ();
202 putchar ('\n');
203@@ -1139,8 +1139,8 @@
204 }
205
206 static void processLicenseOption (
207- const char *const option __unused__,
208- const char *const parameter __unused__)
209+ const char *const option ctags_attr_unused,
210+ const char *const parameter ctags_attr_unused)
211 {
212 printProgramIdentification ();
213 puts ("");
214@@ -1166,8 +1166,8 @@
215 }
216
217 static void processListMapsOption (
218- const char *const __unused__ option,
219- const char *const __unused__ parameter)
220+ const char *const ctags_attr_unused option,
221+ const char *const ctags_attr_unused parameter)
222 {
223 if (parameter [0] == '\0' || strcasecmp (parameter, "all") == 0)
224 printLanguageMaps (LANG_AUTO);
225@@ -1183,8 +1183,8 @@
226 }
227
228 static void processListLanguagesOption (
229- const char *const option __unused__,
230- const char *const parameter __unused__)
231+ const char *const option ctags_attr_unused,
232+ const char *const parameter ctags_attr_unused)
233 {
234 printLanguageList ();
235 exit (0);
236@@ -1358,8 +1358,8 @@
237 }
238
239 static void processVersionOption (
240- const char *const option __unused__,
241- const char *const parameter __unused__)
242+ const char *const option ctags_attr_unused,
243+ const char *const parameter ctags_attr_unused)
244 {
245 printProgramIdentification ();
246 exit (0);
247diff -ur ctags-5.8.orig/options.h ctags-5.8/options.h
248--- ctags-5.8.orig/options.h 2007-09-05 04:00:44.000000000 +0200
249+++ ctags-5.8/options.h 2023-01-29 21:55:10.711944997 +0100
250@@ -122,7 +122,7 @@
251 /*
252 * FUNCTION PROTOTYPES
253 */
254-extern void verbose (const char *const format, ...) __printf__ (1, 2);
255+extern void verbose (const char *const format, ...) ctags_attr_printf (1, 2);
256 extern void freeList (stringList** const pString);
257 extern void setDefaultTagFileName (void);
258 extern void checkOptions (void);
259diff -ur ctags-5.8.orig/parse.c ctags-5.8/parse.c
260--- ctags-5.8.orig/parse.c 2007-07-31 07:35:33.000000000 +0200
261+++ ctags-5.8/parse.c 2023-01-29 21:56:18.749962319 +0100
262@@ -376,7 +376,7 @@
263 */
264
265 extern void processLanguageDefineOption (
266- const char *const option, const char *const parameter __unused__)
267+ const char *const option, const char *const parameter ctags_attr_unused)
268 {
269 #ifdef HAVE_REGEX
270 if (parameter [0] == '\0')
271diff -ur ctags-5.8.orig/routines.c ctags-5.8/routines.c
272--- ctags-5.8.orig/routines.c 2023-01-29 21:39:39.068696639 +0100
273+++ ctags-5.8/routines.c 2023-01-29 21:56:04.163721350 +0100
274@@ -526,7 +526,7 @@
275
276 #if ! defined (HAVE_STAT_ST_INO)
277
278-static void canonicalizePath (char *const path __unused__)
279+static void canonicalizePath (char *const path ctags_attr_unused)
280 {
281 #if defined (MSDOS_STYLE_PATH)
282 char *p;
283diff -ur ctags-5.8.orig/routines.h ctags-5.8/routines.h
284--- ctags-5.8.orig/routines.h 2007-06-07 06:35:21.000000000 +0200
285+++ ctags-5.8/routines.h 2023-01-29 21:55:18.851708213 +0100
286@@ -85,7 +85,7 @@
287 extern void setExecutableName (const char *const path);
288 extern const char *getExecutableName (void);
289 extern const char *getExecutablePath (void);
290-extern void error (const errorSelection selection, const char *const format, ...) __printf__ (2, 3);
291+extern void error (const errorSelection selection, const char *const format, ...) ctags_attr_printf (2, 3);
292
293 /* Memory allocation functions */
294 #ifdef NEED_PROTO_MALLOC
Exuberant ctags -- C cross-reference tool
This page took 0.110818 seconds and 4 git commands to generate.