--- a/cinst/mozilla.c	Thu Mar 27 18:21:59 2014 +0100
+++ b/cinst/mozilla.c	Thu Mar 27 18:24:08 2014 +0100
@@ -104,7 +104,7 @@
     return cdir;
   else
     {
-      DEBUGFPRINT("DEBUG: FATAL!  No %s in environment.\n", envvar);
+      DEBUGPRINTF("DEBUG: FATAL!  No %s in environment.\n", envvar);
       exit(ERR_MOZ_HOMELESS);
     }
 }
@@ -135,7 +135,7 @@
 
   if ((inifile = fopen(inifile_name, "r")) != NULL)
     {
-      DEBUGFPRINT("DEBUG: Searching for profile paths in: '%s'\n", inifile_name);
+      DEBUGPRINTF("DEBUG: Searching for profile paths in: '%s'\n", inifile_name);
 
       inifile_dirname = port_dirname(inifile_name);
       while (fgets(line, LINEBUFLEN, inifile) != NULL)
@@ -163,13 +163,13 @@
                     strncpy(path, value, LINEBUFLEN);
                   if ((fqpath = port_realpath(path)) != NULL)
                     {
-                      DEBUGFPRINT("DEBUG: Found profile path: '%s'\n", fqpath);
+                      DEBUGPRINTF("DEBUG: Found profile path: '%s'\n", fqpath);
                       strv_append(&dirs, fqpath, strlen(fqpath));
                       free (fqpath);
                     }
                   else
                     {
-                      DEBUGFPRINT("DEBUG: WARN!  Non existent profile path: '%s'\n", path);
+                      DEBUGPRINTF("DEBUG: WARN!  Non existent profile path: '%s'\n", path);
                       return_code |= WARN_MOZ_PROFILE_DOES_NOT_EXIST;
                     }
                 }
@@ -182,7 +182,7 @@
     }
   else
     {
-      DEBUGFPRINT("DEBUG: WARN!  Could not open ini file: '%s'\n", inifile_name);
+      DEBUGPRINTF("DEBUG: WARN!  Could not open ini file: '%s'\n", inifile_name);
       return_code |= WARN_MOZ_FAILED_TO_OPEN_INI;
     }
   return dirs;
@@ -230,11 +230,11 @@
                            confdirs[i],
                            mozdirent->d_name,
                            "profiles.ini");
-                  DEBUGFPRINT("DEBUG: checking for %s...\n", path);
+                  DEBUGPRINTF("DEBUG: checking for %s...\n", path);
                   if ((fqpath = port_realpath(path)) != NULL)
                     {
                       strv_append(&inis, fqpath, strlen(fqpath));
-                      DEBUGFPRINT("DEBUG: Found mozilla ini file: '%s'\n", fqpath);
+                      DEBUGPRINTF("DEBUG: Found mozilla ini file: '%s'\n", fqpath);
                       free(fqpath);
                     }
                 }
@@ -243,12 +243,12 @@
         }
       else
         {
-          DEBUGFPRINT("DEBUG: Could not open %s/%s\n", confbase, confdirs[i]);
+          DEBUGPRINTF("DEBUG: Could not open %s/%s\n", confbase, confdirs[i]);
         }
     }
   if (inis == NULL)
     {
-      DEBUGFPRINT("DEBUG: No ini files found - will do nothing!\n");
+      DEBUGPRINTF("DEBUG: No ini files found - will do nothing!\n");
       exit(WARN_MOZ_NO_PROFILES);
     }
   return inis;
@@ -279,7 +279,7 @@
       NSS_Shutdown();
     }
   else
-    DEBUGFPRINT("Could not open nss cer store in %s!", confdir);
+    DEBUGPRINTF("Could not open nss cer store in %s!", confdir);
 }