diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-02-26 23:59:20 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-02-26 23:59:20 +0000 |
| commit | a226a6dd9f63c28ab6d82cf895f69d3daad98801 (patch) | |
| tree | b378dd33d134dd0674bcb46b515d18a1a45f3885 /src/vim.h | |
| parent | a562149de3f44a24669ce191c9d557f979da8556 (diff) | |
| download | vim-git-a226a6dd9f63c28ab6d82cf895f69d3daad98801.tar.gz | |
updated for version 7.0208
Diffstat (limited to 'src/vim.h')
| -rw-r--r-- | src/vim.h | 33 |
1 files changed, 18 insertions, 15 deletions
@@ -1465,6 +1465,24 @@ int vim_memcmp __ARGS((void *, void *, size_t)); */ #define vim_iswhite(x) ((x) == ' ' || (x) == '\t') +/* + * EXTERN is only defined in main.c. That's where global variables are + * actually defined and initialized. + */ +#ifndef EXTERN +# define EXTERN extern +# define INIT(x) +#else +# ifndef INIT +# define INIT(x) x +# define DO_INIT +# endif +#endif + +/* Include option.h before structs.h, because the number of window-local and + * buffer-local options is used there. */ +#include "option.h" /* options and default values */ + /* Note that gui.h is included by structs.h */ #include "structs.h" /* file that defines many structures */ @@ -1663,20 +1681,6 @@ typedef int VimClipboard; /* This is required for the prototypes. */ # define stat(a,b) (access(a,0) ? -1 : stat(a,b)) #endif -/* - * EXTERN is only defined in main.c. That's where global variables are - * actually defined and initialized. - */ -#ifndef EXTERN -# define EXTERN extern -# define INIT(x) -#else -# ifndef INIT -# define INIT(x) x -# define DO_INIT -# endif -#endif - #ifdef FEAT_PROFILE # ifdef WIN3264 typedef LARGE_INTEGER proftime_T; @@ -1687,7 +1691,6 @@ typedef struct timeval proftime_T; typedef int proftime_T; /* dummy for function prototypes */ #endif -#include "option.h" /* option variables and defines */ #include "ex_cmds.h" /* Ex command defines */ #include "proto.h" /* function prototypes */ |