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.

1 files changed, 12 insertions, 12 deletions

diff --git a/pop.c b/pop.c
index 11af0ab9..e2977967 100644
--- a/pop.c
+++ b/pop.c
@@ -279,7 +279,7 @@ static int pop_fetch_headers (CONTEXT *ctx)
 
   if (!ctx->quiet)
     mutt_progress_init (&progress, _("Fetching message headers..."),
-                        M_PROGRESS_MSG, ReadInc, new_count - old_count);
+                        MUTT_PROGRESS_MSG, ReadInc, new_count - old_count);
 
   if (ret == 0)
   {
@@ -333,7 +333,7 @@ static int pop_fetch_headers (CONTEXT *ctx)
 #if USE_HCACHE
       else
       {
-	mutt_hcache_store (hc, ctx->hdrs[i]->data, ctx->hdrs[i], 0, strlen, M_GENERATE_UIDVALIDITY);
+	mutt_hcache_store (hc, ctx->hdrs[i]->data, ctx->hdrs[i], 0, strlen, MUTT_GENERATE_UIDVALIDITY);
       }
 
       FREE(&data);
@@ -436,12 +436,12 @@ int pop_open_mailbox (CONTEXT *ctx)
 
   /* init (hard-coded) ACL rights */
   memset (ctx->rights, 0, sizeof (ctx->rights));
-  mutt_bit_set (ctx->rights, M_ACL_SEEN);
-  mutt_bit_set (ctx->rights, M_ACL_DELETE);
+  mutt_bit_set (ctx->rights, MUTT_ACL_SEEN);
+  mutt_bit_set (ctx->rights, MUTT_ACL_DELETE);
 #if USE_HCACHE
   /* flags are managed using header cache, so it only makes sense to
    * enable them in that case */
-  mutt_bit_set (ctx->rights, M_ACL_WRITE);
+  mutt_bit_set (ctx->rights, MUTT_ACL_WRITE);
 #endif
 
   FOREVER
@@ -570,7 +570,7 @@ int pop_fetch_message (MESSAGE* msg, CONTEXT* ctx, int msgno)
     }
 
     mutt_progress_init (&progressbar, _("Fetching message..."),
-			M_PROGRESS_SIZE, NetInc, h->content->length + h->content->offset - 1);
+			MUTT_PROGRESS_SIZE, NetInc, h->content->length + h->content->offset - 1);
 
     /* see if we can put in body cache; use our cache as fallback */
     if (!(msg->fp = mutt_bcache_put (pop_data->bcache, h->data, 1)))
@@ -676,7 +676,7 @@ int pop_sync_mailbox (CONTEXT *ctx, int *index_hint)
       return -1;
 
     mutt_progress_init (&progress, _("Marking messages deleted..."),
-			M_PROGRESS_MSG, WriteInc, ctx->deleted);
+			MUTT_PROGRESS_MSG, WriteInc, ctx->deleted);
 
 #if USE_HCACHE
     hc = pop_hcache_open (pop_data, ctx->path);
@@ -702,7 +702,7 @@ int pop_sync_mailbox (CONTEXT *ctx, int *index_hint)
 #if USE_HCACHE
       if (ctx->hdrs[i]->changed)
       {
-	mutt_hcache_store (hc, ctx->hdrs[i]->data, ctx->hdrs[i], 0, strlen, M_GENERATE_UIDVALIDITY);
+	mutt_hcache_store (hc, ctx->hdrs[i]->data, ctx->hdrs[i], 0, strlen, MUTT_GENERATE_UIDVALIDITY);
       }
 #endif
 
@@ -762,7 +762,7 @@ int pop_check_mailbox (CONTEXT *ctx, int *index_hint)
     return -1;
 
   if (ret > 0)
-    return M_NEW_MAIL;
+    return MUTT_NEW_MAIL;
 
   return 0;
 }
@@ -850,7 +850,7 @@ void pop_fetch_mail (void)
     goto finish;
   }
 
-  if (mx_open_mailbox (NONULL (Spoolfile), M_APPEND, &ctx) == NULL)
+  if (mx_open_mailbox (NONULL (Spoolfile), MUTT_APPEND, &ctx) == NULL)
     goto finish;
 
   delanswer = query_quadoption (OPT_POPDELETE, _("Delete messages from server?"));
@@ -860,7 +860,7 @@ void pop_fetch_mail (void)
 
   for (i = last + 1 ; i <= msgs ; i++)
   {
-    if ((msg = mx_open_new_message (&ctx, NULL, M_ADD_FROM)) == NULL)
+    if ((msg = mx_open_new_message (&ctx, NULL, MUTT_ADD_FROM)) == NULL)
       ret = -3;
     else
     {
@@ -878,7 +878,7 @@ void pop_fetch_mail (void)
       mx_close_message (&msg);
     }
 
-    if (ret == 0 && delanswer == M_YES)
+    if (ret == 0 && delanswer == MUTT_YES)
     {
       /* delete the message on the server */
       snprintf (buffer, sizeof (buffer), "DELE %d\r\n", i);