Mercurial > vim

comparison src/proto.h @ 18773:38a3bef525e6 v8.1.2376

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2376: preprocessor indents are incorrect Commit: https://github.com/vim/vim/commit/912bc4a51af0ad947cb39deba2a6fa4ee27af906 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Dec 1 18:58:11 2019 +0100 patch 8.1.2376: preprocessor indents are incorrect Problem: Preprocessor indents are incorrect. Solution: Fix the indents. (Ken Takata, closes https://github.com/vim/vim/issues/5298)
author Bram Moolenaar <Bram@vim.org>
date Sun, 01 Dec 2019 19:00:04 +0100
parents 49b78d6465e5
children 94eda51ba9ba
comparison
equal deleted inserted replaced
18772:cddcc348bc5a 18773:38a3bef525e6
111 # endif 111 # endif
112 # ifdef FEAT_ARABIC 112 # ifdef FEAT_ARABIC
113 # include "arabic.pro" 113 # include "arabic.pro"
114 # endif 114 # endif
115 # ifdef FEAT_VIMINFO 115 # ifdef FEAT_VIMINFO
116 # include "viminfo.pro" 116 # include "viminfo.pro"
117 # endif 117 # endif
118 118
119 // These prototypes cannot be produced automatically. 119 // These prototypes cannot be produced automatically.
120 int smsg(const char *, ...) 120 int smsg(const char *, ...)
121 #ifdef USE_PRINTF_FORMAT_ATTRIBUTE 121 # ifdef USE_PRINTF_FORMAT_ATTRIBUTE
122 __attribute__((format(printf, 1, 0))) 122 __attribute__((format(printf, 1, 0)))
123 #endif 123 # endif
124 ; 124 ;
125 125
126 int smsg_attr(int, const char *, ...) 126 int smsg_attr(int, const char *, ...)
127 #ifdef USE_PRINTF_FORMAT_ATTRIBUTE 127 # ifdef USE_PRINTF_FORMAT_ATTRIBUTE
128 __attribute__((format(printf, 2, 3))) 128 __attribute__((format(printf, 2, 3)))
129 #endif 129 # endif
130 ; 130 ;
131 131
132 int smsg_attr_keep(int, const char *, ...) 132 int smsg_attr_keep(int, const char *, ...)
133 #ifdef USE_PRINTF_FORMAT_ATTRIBUTE 133 # ifdef USE_PRINTF_FORMAT_ATTRIBUTE
134 __attribute__((format(printf, 2, 3))) 134 __attribute__((format(printf, 2, 3)))
135 #endif 135 # endif
136 ; 136 ;
137 137
138 // These prototypes cannot be produced automatically. 138 // These prototypes cannot be produced automatically.
139 int semsg(const char *, ...) 139 int semsg(const char *, ...)
140 #ifdef USE_PRINTF_FORMAT_ATTRIBUTE 140 # ifdef USE_PRINTF_FORMAT_ATTRIBUTE
141 __attribute__((format(printf, 1, 0))) 141 __attribute__((format(printf, 1, 0)))
142 #endif 142 # endif
143 ; 143 ;
144 144
145 // These prototypes cannot be produced automatically. 145 // These prototypes cannot be produced automatically.
146 void siemsg(const char *, ...) 146 void siemsg(const char *, ...)
147 #ifdef USE_PRINTF_FORMAT_ATTRIBUTE 147 # ifdef USE_PRINTF_FORMAT_ATTRIBUTE
148 __attribute__((format(printf, 1, 0))) 148 __attribute__((format(printf, 1, 0)))
149 #endif 149 # endif
150 ; 150 ;
151 151
152 int vim_snprintf_add(char *, size_t, const char *, ...) 152 int vim_snprintf_add(char *, size_t, const char *, ...)
153 #ifdef USE_PRINTF_FORMAT_ATTRIBUTE 153 # ifdef USE_PRINTF_FORMAT_ATTRIBUTE
154 __attribute__((format(printf, 3, 4))) 154 __attribute__((format(printf, 3, 4)))
155 #endif 155 # endif
156 ; 156 ;
157 157
158 int vim_snprintf(char *, size_t, const char *, ...) 158 int vim_snprintf(char *, size_t, const char *, ...)
159 #ifdef USE_PRINTF_FORMAT_ATTRIBUTE 159 # ifdef USE_PRINTF_FORMAT_ATTRIBUTE
160 __attribute__((format(printf, 3, 4))) 160 __attribute__((format(printf, 3, 4)))
161 #endif 161 # endif
162 ; 162 ;
163 163
164 int vim_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap); 164 int vim_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap);
165 int vim_vsnprintf_typval(char *str, size_t str_m, const char *fmt, va_list ap, typval_T *tvs); 165 int vim_vsnprintf_typval(char *str, size_t str_m, const char *fmt, va_list ap, typval_T *tvs);
166 166
167 # include "message.pro" 167 # include "message.pro"
168 # include "misc1.pro" 168 # include "misc1.pro"
169 # include "misc2.pro" 169 # include "misc2.pro"
170 #ifndef HAVE_STRPBRK // not generated automatically from misc2.c 170 # ifndef HAVE_STRPBRK // not generated automatically from misc2.c
171 char_u *vim_strpbrk(char_u *s, char_u *charset); 171 char_u *vim_strpbrk(char_u *s, char_u *charset);
172 #endif 172 # endif
173 #ifndef HAVE_QSORT 173 # ifndef HAVE_QSORT
174 // Use our own qsort(), don't define the prototype when not used. 174 // Use our own qsort(), don't define the prototype when not used.
175 void qsort(void *base, size_t elm_count, size_t elm_size, int (*cmp)(const void *, const void *)); 175 void qsort(void *base, size_t elm_count, size_t elm_size, int (*cmp)(const void *, const void *));
176 #endif 176 # endif
177 # include "mouse.pro" 177 # include "mouse.pro"
178 # include "move.pro" 178 # include "move.pro"
179 # include "mbyte.pro" 179 # include "mbyte.pro"
180 # ifdef VIMDLL 180 # ifdef VIMDLL
181 // Function name differs when VIMDLL is defined 181 // Function name differs when VIMDLL is defined
186 # include "ops.pro" 186 # include "ops.pro"
187 # include "option.pro" 187 # include "option.pro"
188 # include "optionstr.pro" 188 # include "optionstr.pro"
189 # include "popupmenu.pro" 189 # include "popupmenu.pro"
190 # if defined(FEAT_PROFILE) || defined(FEAT_RELTIME) 190 # if defined(FEAT_PROFILE) || defined(FEAT_RELTIME)
191 # include "profiler.pro" 191 # include "profiler.pro"
192 # endif 192 # endif
193 # include "quickfix.pro" 193 # include "quickfix.pro"
194 # include "regexp.pro" 194 # include "regexp.pro"
195 # include "register.pro" 195 # include "register.pro"
196 # include "scriptfile.pro" 196 # include "scriptfile.pro"
267 # ifdef FEAT_JOB_CHANNEL 267 # ifdef FEAT_JOB_CHANNEL
268 # include "channel.pro" 268 # include "channel.pro"
269 269
270 // Not generated automatically, to add extra attribute. 270 // Not generated automatically, to add extra attribute.
271 void ch_log(channel_T *ch, const char *fmt, ...) 271 void ch_log(channel_T *ch, const char *fmt, ...)
272 #ifdef USE_PRINTF_FORMAT_ATTRIBUTE 272 # ifdef USE_PRINTF_FORMAT_ATTRIBUTE
273 __attribute__((format(printf, 2, 3))) 273 __attribute__((format(printf, 2, 3)))
274 #endif 274 # endif
275 ; 275 ;
276 276
277 # endif 277 # endif
278 278
279 # if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL) 279 # if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL)
330 * included before the perl include files. But then CV is not defined, which 330 * included before the perl include files. But then CV is not defined, which
331 * is used in if_perl.pro. To get around this, the perl prototype files are 331 * is used in if_perl.pro. To get around this, the perl prototype files are
332 * not included here for the perl files. Use a dummy define for CV for the 332 * not included here for the perl files. Use a dummy define for CV for the
333 * other files. 333 * other files.
334 */ 334 */
335 #if defined(FEAT_PERL) && !defined(IN_PERL_FILE) 335 # if defined(FEAT_PERL) && !defined(IN_PERL_FILE)
336 # define CV void 336 # define CV void
337 # include "if_perl.pro" 337 # include "if_perl.pro"
338 # include "if_perlsfio.pro" 338 # include "if_perlsfio.pro"
339 #endif 339 # endif
340 340
341 #ifdef MACOS_CONVERT 341 # ifdef MACOS_CONVERT
342 # include "os_mac_conv.pro" 342 # include "os_mac_conv.pro"
343 #endif 343 # endif
344 #if defined(MACOS_X_DARWIN) && defined(FEAT_CLIPBOARD) && !defined(FEAT_GUI) 344 # if defined(MACOS_X_DARWIN) && defined(FEAT_CLIPBOARD) && !defined(FEAT_GUI)
345 // functions in os_macosx.m 345 // functions in os_macosx.m
346 void clip_mch_lose_selection(Clipboard_T *cbd); 346 void clip_mch_lose_selection(Clipboard_T *cbd);
347 int clip_mch_own_selection(Clipboard_T *cbd); 347 int clip_mch_own_selection(Clipboard_T *cbd);
348 void clip_mch_request_selection(Clipboard_T *cbd); 348 void clip_mch_request_selection(Clipboard_T *cbd);
349 void clip_mch_set_selection(Clipboard_T *cbd); 349 void clip_mch_set_selection(Clipboard_T *cbd);
350 #endif 350 # endif
351 #endif // !PROTO && !NOPROTO 351 #endif // !PROTO && !NOPROTO