Replace macros with inline functions

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@386 9d0c8265-081b-0410-96cb-a4ca84ce46f8

2 files changed, 4 insertions, 2 deletions

diff --git a/editor/pammixinterlace.c b/editor/pammixinterlace.c
index 579a8092..f22563f6 100644
--- a/editor/pammixinterlace.c
+++ b/editor/pammixinterlace.c
@@ -14,6 +14,8 @@
 
 ******************************************************************************/
 
+#define _BSD_SOURCE    /* Make sure strcaseeq() is in nstring.h */
+
 #include <string.h>
 
 #include "mallocvar.h"
@@ -206,7 +208,7 @@ parseCommandLine(int argc, char ** argv,
         unsigned int i;
         cmdlineP->filterP = NULL;
         for (i = 0; i < sizeof filters / sizeof(struct filter); ++i) {
-            if (STRCASEEQ(filterName, filters[i].name)) {
+            if (strcaseeq(filterName, filters[i].name)) {
                 cmdlineP->filterP = &filters[i];
                 break;
             }
diff --git a/editor/ppmcolormask.c b/editor/ppmcolormask.c
index 57e5c825..eed64c19 100644
--- a/editor/ppmcolormask.c
+++ b/editor/ppmcolormask.c
@@ -60,7 +60,7 @@ parseColorOpt(const char *         const colorOpt,
         const char * token;
         token = strsepN(&cursor, ",");
         if (token) {
-            if (STRNEQ(token, "bk:", 3)) {
+            if (strneq(token, "bk:", 3)) {
                 cmdlineP->maskColor[colorCount].matchType = MATCH_BK;
                 cmdlineP->maskColor[colorCount].u.bkColor =
                     ppm_bk_color_from_name(&token[3]);