summaryrefslogtreecommitdiffstats
path: root/rfc2047.c
diff options
context:
space:
mode:
authorDerek Martin <code@pizzashack.org>2016-05-09 14:06:54 -0700
committerDerek Martin <code@pizzashack.org>2016-05-09 14:06:54 -0700
commit9cafb05c0efadc771197c0e1e98fa9d989b48d41 (patch)
treec70f969ad76a417ec896f10ecccd17ca0702c8ef /rfc2047.c
parentfa0dcb09fe69d23ceba28159e6be6b72adb9a9df (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 'rfc2047.c')
-rw-r--r--rfc2047.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/rfc2047.c b/rfc2047.c
index aa024227..505cc910 100644
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -120,7 +120,7 @@ int convert_nonmime_string (char **ps)
}
mutt_convert_string (ps,
(const char *)mutt_get_default_charset (),
- Charset, M_ICONV_HOOK_FROM);
+ Charset, MUTT_ICONV_HOOK_FROM);
return -1;
}
@@ -713,7 +713,7 @@ static int rfc2047_decode_word (char *d, const char *s, size_t len)
}
if (charset)
- mutt_convert_string (&d0, charset, Charset, M_ICONV_HOOK_FROM);
+ mutt_convert_string (&d0, charset, Charset, MUTT_ICONV_HOOK_FROM);
mutt_filter_unprintable (&d0);
strfcpy (d, d0, len);
rv = 0;