Fix literal suffix errors in C++14, caused by missing spaces between C-strings and macros. See also: https://bugs.gentoo.org/show_bug.cgi?id=585630 --- a/configure.in +++ b/configure.in @@ -81,8 +81,6 @@ dnl Checks for programs. dnl AC_PROG_CC AC_LANG_CPLUSPLUS -CXXFLAGS=" " -dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g' CCC="$CCC g++" dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX) AC_PROG_CXX @@ -216,7 +214,7 @@ dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot compute depends)]) rm -f Makedep -AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)]) +AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)]) AC_PTS_OK echo "configure done. Now you should run: make; make install" --- a/gensio.cpp +++ b/gensio.cpp @@ -494,7 +494,7 @@ #if HAVE_PTS_POPEN if (!tmpsname) { - if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; + if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */ } else { #else @@ -622,7 +622,7 @@ if (state==0) { /* Read the whole stream from `in', write it to `tmpsname' */ #if HAVE_PTS_POPEN if (!tmpsname) { - if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; + if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */ vi_precopy(); in.vi_read(0,0); @@ -730,12 +730,7 @@ /* --- */ - -#if HAVE_lstat_in_sys_stat -# define PTS_lstat lstat -#else # define PTS_lstat stat -#endif /** @param fname must start with '/' (dir separator) * @return true if file successfully created --- a/in_ps.cpp +++ b/in_ps.cpp @@ -137,7 +137,7 @@ // fprintf(stderr, "bbox=[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]\n", llx, lly, urx, ury); /* Dat: we must call translate _after_ setpagedevice (so it will take effect), at least with ESP Ghostscript 7.05.6 (2003-02-05); BUGFIX at Fri Aug 12 22:49:07 CEST 2005 */ sprintf(bboxline, - "<>setpagedevice\n" + "<>setpagedevice\n" /* removing /PageSize also cancels /a4, /a5 etc. */ /* we need `currentmatrix ... setpagedevice setmatrix' because * setpagedevice cancels the current transformation matrix so our @@ -147,7 +147,7 @@ "/setpagedevice{matrix currentmatrix exch " "dup length dict copy dup /PageSize undef setpagedevice " "setmatrix}bind def\n" - "%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g translate\n" + "%" PTS_CFG_PRINTFGLEN "g %" PTS_CFG_PRINTFGLEN "g translate\n" , urx-llx, ury-lly, -llx, -lly); } else { Error::sev(Error::WARNING) << "in_eps_reader: missing EPS bbox" << (Error*)0; --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ export PERL_BADLANG CXXX=$(CXD_assert) -LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS) +LDALL=$(LDXX) $(LDFLAGS) $(LIBS) ifeq ($(ENABLE_DEBUG), no) CXXX=$(CXD_no) endif @@ -51,8 +51,8 @@ IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS)) IDE_TARGETS_release := $(TARGETS) -CXD_assert =$(CXX) -s -O2 -CXD_no =$(CXX) -s -DNDEBUG -O3 +CXD_assert =$(CXX) +CXD_no =$(CXX) -DNDEBUG # CXD_yes =$(CXX) $(GFLAG) -lefence CXD_yes =$(CXX) $(GFLAG) CXD_checker=checkerg++ $(GFLAG) --- a/minips.cpp +++ b/minips.cpp @@ -292,9 +292,9 @@ void MiniPS::Real::dump(GenBuffer::Writable &out_, bool dumpPS_force) { char buf[64]; /* Imp: should be enough?? */ if (metric!=0 && (dumpPS_force || dumpPS)) { - sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g%s", d, me_psfactor[metric]); + sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g%s", d, me_psfactor[metric]); } else { - sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d*me_factor[metric]); + sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d*me_factor[metric]); } out_ << buf; } @@ -1044,7 +1044,7 @@ } else { d = d < 0 ? 72.0 / -d : d / 72.0; char buf[64]; /* Dat: enough */ - sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d); + sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d); out << buf; } } @@ -1093,7 +1093,7 @@ out << (rounding>=2 && ll<0 ? 0 : ll); } else { char buf[64]; /* Dat: enough */ - sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d); + sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d); out << buf; } } --- a/ps_tiny.c +++ b/ps_tiny.c @@ -151,7 +151,7 @@ } static void erri(char const*msg1, char const*msg2) { - fprintf(stderr, "%s: error at %"SLEN_P"u.%"SLEN_P"u.%"SLEN_P"u: %s%s\n", + fprintf(stderr, "%s: error at %" SLEN_P "u.%" SLEN_P "u.%" SLEN_P "u: %s%s\n", PROGNAME, curline, curofs-leftofs+1, curofs, msg1, msg2?msg2:""); exit(3); } @@ -230,7 +230,7 @@ /** @param b: assume null-terminated @return true on error */ static /*inline*/ sbool toInteger(char *s, psint_t *ret) { int n=0; /* BUGFIX?? found by __CHECKER__ */ - return sscanf(s, "%"SLEN_P"i%n", ret, &n)<1 || s[n]!='\0'; + return sscanf(s, "%" SLEN_P "i%n", ret, &n)<1 || s[n]!='\0'; } /** @param b: assume null-terminated @return true on error */ @@ -700,7 +700,7 @@ getotag("Abbr"); getkey("acount"); acount=getuintval(); getkey("xcount"); xcount=getuintval(); - sprintf(tmp,"%"SLEN_P"u dict%%", acount+xcount); + sprintf(tmp,"%" SLEN_P "u dict%%", acount+xcount); setifmt(tmp,0); copy("I"); noifmt(); gettagbeg();