Mercurial > vim

comparison src/eval.c @ 32100:fcc497515cce v9.0.1381

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1381: ACCESS_ names have a conflict with on some systems Commit: https://github.com/vim/vim/commit/d8742476d11e75e3b733f21d9aeac1cbd2a02c6f Author: =?UTF-8?q?Ola=20S=C3=B6der?= <rolfkopman@gmail.com> Date: Sun Mar 5 13:12:32 2023 +0000 patch 9.0.1381: ACCESS_ names have a conflict with on some systems Problem: ACCESS_ names have a conflict with on some systems. Solution: Rename by prepending VIM_. (Ola S?der, closes https://github.com/vim/vim/issues/12105)
author Bram Moolenaar <Bram@vim.org>
date Sun, 05 Mar 2023 14:15:05 +0100
parents ec05de98b0f7
children 04d9dff67d99
comparison
equal deleted inserted replaced
32099:9b58bd826012 32100:fcc497515cce
1574 if (STRNCMP(om->ocm_name, key, p - key) == 0 1574 if (STRNCMP(om->ocm_name, key, p - key) == 0
1575 && om->ocm_name[p - key] == NUL) 1575 && om->ocm_name[p - key] == NUL)
1576 { 1576 {
1577 switch (om->ocm_access) 1577 switch (om->ocm_access)
1578 { 1578 {
1579 case ACCESS_PRIVATE: 1579 case VIM_ACCESS_PRIVATE:
1580 semsg(_(e_cannot_access_private_member_str), 1580 semsg(_(e_cannot_access_private_member_str),
1581 om->ocm_name); 1581 om->ocm_name);
1582 return NULL; 1582 return NULL;
1583 case ACCESS_READ: 1583 case VIM_ACCESS_READ:
1584 if ((flags & GLV_READ_ONLY) == 0) 1584 if ((flags & GLV_READ_ONLY) == 0)
1585 { 1585 {
1586 semsg(_(e_member_is_not_writable_str), 1586 semsg(_(e_member_is_not_writable_str),
1587 om->ocm_name); 1587 om->ocm_name);
1588 return NULL; 1588 return NULL;
1589 } 1589 }
1590 break; 1590 break;
1591 case ACCESS_ALL: 1591 case VIM_ACCESS_ALL:
1592 break; 1592 break;
1593 } 1593 }
1594 1594
1595 lp->ll_valtype = om->ocm_type; 1595 lp->ll_valtype = om->ocm_type;
1596 1596