X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fascii.c;h=12cde8e5f2f8b18722d1fd0bc0988896900cac69;hb=c75794cffb05769b71a346af8513a3e8dde55f94;hp=c5f30816fb12efefae8865ea43de35158b59d13c;hpb=ddb7b52128d8f1f54d9632dc3a15c7869e0fbcce;p=pspp

diff --git a/src/output/ascii.c b/src/output/ascii.c
index c5f30816fb..12cde8e5f2 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -184,7 +184,7 @@ ascii_create (const char *file_name, enum settings_output_devices device_type,
                             "bold", EMPH_BOLD,
                             "underline", EMPH_UNDERLINE,
                             "none", EMPH_NONE,
-                            (char *) NULL);
+                            NULL);
 
   a->chart_file_name = parse_chart_file_name (opt (d, o, "charts", file_name));
 
@@ -357,7 +357,7 @@ ascii_flush (struct output_driver *driver)
       ascii_close_page (a);
 
       if (fn_close (a->file_name, a->file) != 0)
-        error (0, errno, _("ascii: closing output file \"%s\""),
+        error (0, errno, _("ascii: closing output file `%s'"),
                a->file_name);
       a->file = NULL;
     }
@@ -487,6 +487,7 @@ ascii_submit (struct output_driver *driver,
 
   if (is_table_item (output_item))
     ascii_output_table_item (a, to_table_item (output_item));
+#ifdef HAVE_CAIRO
   else if (is_chart_item (output_item) && a->chart_file_name != NULL)
     {
       struct chart_item *chart_item = to_chart_item (output_item);
@@ -506,6 +507,7 @@ ascii_submit (struct output_driver *driver,
           free (file_name);
         }
     }
+#endif  /* HAVE_CAIRO */
   else if (is_text_item (output_item))
     {
       const struct text_item *text_item = to_text_item (output_item);
@@ -801,7 +803,7 @@ ascii_open_page (struct ascii_driver *a)
         }
       else
         {
-          error (0, errno, _("ascii: opening output file \"%s\""),
+          error (0, errno, _("ascii: opening output file `%s'"),
                  a->file_name);
           a->error = true;
           return false;