diff options
| author | Derek Martin <code@pizzashack.org> | 2016-05-09 14:06:54 -0700 |
|---|---|---|
| committer | Derek Martin <code@pizzashack.org> | 2016-05-09 14:06:54 -0700 |
| commit | 9cafb05c0efadc771197c0e1e98fa9d989b48d41 (patch) | |
| tree | c70f969ad76a417ec896f10ecccd17ca0702c8ef /imap/command.c | |
| parent | fa0dcb09fe69d23ceba28159e6be6b72adb9a9df (diff) | |
Change M_* symbols to MUTT_*
Changeset 23334e967dd7 created a workaround for a namespace conflict
with Solaris and derivatives. After some discussion, the team decided
it would be best to move away from using the "M_" prefix for macros.
This patch was automatically generated by running:
perl -wpi -e 's/\bM_(\w+)\b/MUTT_$1/g' `find . -name '*.[ch]' -print`
with the exception that sys_socket.h was exempted. (That file will
be backed out subsequent to this commit.)
Thanks to Andras Salamon for supplying the perl script used to make
this change.
Diffstat (limited to 'imap/command.c')
| -rw-r--r-- | imap/command.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/imap/command.c b/imap/command.c index d99a99a3..fedcfba9 100644 --- a/imap/command.c +++ b/imap/command.c @@ -806,47 +806,47 @@ static void cmd_parse_myrights (IMAP_DATA* idata, const char* s) switch (*s) { case 'l': - mutt_bit_set (idata->ctx->rights, M_ACL_LOOKUP); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_LOOKUP); break; case 'r': - mutt_bit_set (idata->ctx->rights, M_ACL_READ); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_READ); break; case 's': - mutt_bit_set (idata->ctx->rights, M_ACL_SEEN); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_SEEN); break; case 'w': - mutt_bit_set (idata->ctx->rights, M_ACL_WRITE); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_WRITE); break; case 'i': - mutt_bit_set (idata->ctx->rights, M_ACL_INSERT); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_INSERT); break; case 'p': - mutt_bit_set (idata->ctx->rights, M_ACL_POST); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_POST); break; case 'a': - mutt_bit_set (idata->ctx->rights, M_ACL_ADMIN); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_ADMIN); break; case 'k': - mutt_bit_set (idata->ctx->rights, M_ACL_CREATE); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_CREATE); break; case 'x': - mutt_bit_set (idata->ctx->rights, M_ACL_DELMX); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_DELMX); break; case 't': - mutt_bit_set (idata->ctx->rights, M_ACL_DELETE); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_DELETE); break; case 'e': - mutt_bit_set (idata->ctx->rights, M_ACL_EXPUNGE); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_EXPUNGE); break; /* obsolete rights */ case 'c': - mutt_bit_set (idata->ctx->rights, M_ACL_CREATE); - mutt_bit_set (idata->ctx->rights, M_ACL_DELMX); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_CREATE); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_DELMX); break; case 'd': - mutt_bit_set (idata->ctx->rights, M_ACL_DELETE); - mutt_bit_set (idata->ctx->rights, M_ACL_EXPUNGE); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_DELETE); + mutt_bit_set (idata->ctx->rights, MUTT_ACL_EXPUNGE); break; default: dprint(1, (debugfile, "Unknown right: %c\n", *s)); @@ -969,7 +969,7 @@ static void cmd_parse_status (IMAP_DATA* idata, char* s) /* should perhaps move this code back to imap_buffy_check */ for (inc = Incoming; inc; inc = inc->next) { - if (inc->magic != M_IMAP) + if (inc->magic != MUTT_IMAP) continue; if (imap_parse_path (inc->path, &mx) < 0) |