diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/pch.c | 6 |
3 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,6 @@ * src/util.c: Fix the use of HAVE_UTIME_H. + * src/pch.c (EDITOR_PROGRAM): Rename from ed_PROGRAM. + * configure.ac (EDITOR_PROGRAM): Likewise. 2010-02-21 Andreas Gruenbacher <agruen@suse.de> diff --git a/configure.ac b/configure.ac index db4f750..368f3bd 100644 --- a/configure.ac +++ b/configure.ac @@ -33,9 +33,7 @@ AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL AC_PROG_MAKE_SET -# Use ed_PROGRAM, not ED_PROGRAM, -# because <errno.h> reserves symbols starting with `E'. -AC_PATH_PROG(ed_PROGRAM, ed, ed) +AC_PATH_PROG(EDITOR_PROGRAM, ed, ed) AC_PATH_PROG(TEST_SHELL, [bash sh]) @@ -2064,7 +2064,7 @@ get_ed_command_letter (char const *line) void do_ed_script (FILE *ofp) { - static char const ed_program[] = ed_PROGRAM; + static char const editor_program[] = EDITOR_PROGRAM; register file_offset beginning_of_this_line; register FILE *pipefp = 0; @@ -2075,7 +2075,7 @@ do_ed_script (FILE *ofp) assert (! inerrno); TMPOUTNAME_needs_removal = 1; copy_file (inname, TMPOUTNAME, 0, exclusive, instat.st_mode, true); - sprintf (buf, "%s %s%s", ed_program, verbosity == VERBOSE ? "" : "- ", + sprintf (buf, "%s %s%s", editor_program, verbosity == VERBOSE ? "" : "- ", TMPOUTNAME); fflush (stdout); pipefp = popen(buf, binary_transput ? "wb" : "w"); @@ -2118,7 +2118,7 @@ do_ed_script (FILE *ofp) || fflush (pipefp) != 0) write_fatal (); if (pclose (pipefp) != 0) - fatal ("%s FAILED", ed_program); + fatal ("%s FAILED", editor_program); if (ofp) { |