diff options
| author | =?UTF-8?q?Ola=20S=C3=B6der?= <rolfkopman@gmail.com> | 2023-03-05 13:12:32 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-03-05 13:12:32 +0000 |
| commit | d8742476d11e75e3b733f21d9aeac1cbd2a02c6f (patch) | |
| tree | ae90655413daae3c88c7d2c9c9369b2c58f202f6 | |
| parent | 5fb78c3fa5c996c08a65431d698bd2c251eef5c7 (diff) | |
patch 9.0.1381: ACCESS_ names have a conflict with on some systemsv9.0.1381
Problem: ACCESS_ names have a conflict with on some systems.
Solution: Rename by prepending VIM_. (Ola Söder, closes #12105)
| -rw-r--r-- | src/eval.c | 6 | ||||
| -rw-r--r-- | src/fileio.c | 2 | ||||
| -rw-r--r-- | src/structs.h | 6 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9class.c | 4 |
5 files changed, 11 insertions, 9 deletions
diff --git a/src/eval.c b/src/eval.c index 0d32fa046f..a647b514f2 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1576,11 +1576,11 @@ get_lval( { switch (om->ocm_access) { - case ACCESS_PRIVATE: + case VIM_ACCESS_PRIVATE: semsg(_(e_cannot_access_private_member_str), om->ocm_name); return NULL; - case ACCESS_READ: + case VIM_ACCESS_READ: if ((flags & GLV_READ_ONLY) == 0) { semsg(_(e_member_is_not_writable_str), @@ -1588,7 +1588,7 @@ get_lval( return NULL; } break; - case ACCESS_ALL: + case VIM_ACCESS_ALL: break; } diff --git a/src/fileio.c b/src/fileio.c index d8b395acfd..5a2e388e4a 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -3830,7 +3830,7 @@ vim_rename(char_u *from, char_u *to) * original file will be somewhere else so the backup isn't really * important. If autoscripting is off the rename may fail. */ - flock = Lock((UBYTE *)from, (long)ACCESS_READ); + flock = Lock((UBYTE *)from, (long)VIM_ACCESS_READ); #endif mch_remove(to); #ifdef AMIGA diff --git a/src/structs.h b/src/structs.h index 46a71cb0d4..39248a7e48 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1469,9 +1469,9 @@ typedef struct { #define TTFLAG_SUPER 0x40 // object from "super". typedef enum { - ACCESS_PRIVATE, // read/write only inside th class - ACCESS_READ, // read everywhere, write only inside th class - ACCESS_ALL // read/write everywhere + VIM_ACCESS_PRIVATE, // read/write only inside th class + VIM_ACCESS_READ, // read everywhere, write only inside th class + VIM_ACCESS_ALL // read/write everywhere } omacc_T; /* diff --git a/src/version.c b/src/version.c index fbe5346868..19ea3e4a02 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1381, +/**/ 1380, /**/ 1379, diff --git a/src/vim9class.c b/src/vim9class.c index a2b186ec5a..74664f1b26 100644 --- a/src/vim9class.c +++ b/src/vim9class.c @@ -148,8 +148,8 @@ add_member( return FAIL; ocmember_T *m = ((ocmember_T *)gap->ga_data) + gap->ga_len; m->ocm_name = vim_strnsave(varname, varname_end - varname); - m->ocm_access = has_public ? ACCESS_ALL - : *varname == '_' ? ACCESS_PRIVATE : ACCESS_READ; + m->ocm_access = has_public ? VIM_ACCESS_ALL + : *varname == '_' ? VIM_ACCESS_PRIVATE : VIM_ACCESS_READ; m->ocm_type = type; if (init_expr != NULL) m->ocm_init = init_expr; |