1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

Fix build with clang and newer texinfo

Phabric:	D478
Submitted by:	kan
Reviewed by:	bapt and i
This commit is contained in:
Antoine Brodin 2014-08-06 07:56:13 +00:00
parent ebdadb5af7
commit 260e73db89
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=364155
2 changed files with 75 additions and 0 deletions

View File

@ -0,0 +1,34 @@
--- ddd/ddd.texi.orig 2009-02-11 17:25:07 +0000
+++ ddd/ddd.texi
@@ -1,4 +1,4 @@
-\def\postscript{}\input texinfo @c -*- texinfo -*-
+\def\postscript\input texinfo @c -*- texinfo -*-
@c $Id$
@c DDD Manual
@@ -154,7 +154,7 @@
@c The title page.
@ifnothtml
@titlepage
-@sp -7
+@sp 7
@ifnottex
@title Debugging with @value{DDD}
@subtitle User's Guide and Reference Manual
--- ddd/ddd-themes.texi.orig 2009-02-11 17:25:07 +0000
+++ ddd/ddd-themes.texi
@@ -1,4 +1,4 @@
-\def\postscript{}\input texinfo @c -*- texinfo -*-
+\def\postscript\input texinfo @c -*- texinfo -*-
@c $Id$
@c Writing DDD Themes
@@ -136,7 +136,7 @@
@c The title page.
@ifnothtml
@titlepage
-@sp -7
+@sp 7
@ifnottex
@title Writing @value{DDD} Themes
@subtitle User's Guide and Reference Manual

View File

@ -0,0 +1,41 @@
--- ddd/strclass.h.orig 2009-02-11 17:25:06 +0000
+++ ddd/strclass.h
@@ -811,9 +811,9 @@
const regex& sep);
friend string common_prefix(const string& x, const string& y,
- int startpos = 0);
+ int startpos);
friend string common_suffix(const string& x, const string& y,
- int startpos = -1);
+ int startpos);
friend string replicate(char c, int n);
friend string replicate(const string& y, int n);
friend string join(const string *src, int n, const string& sep);
@@ -864,8 +864,8 @@
friend std::istream& operator>>(std::istream& s, string& x);
friend int readline(std::istream& s, string& x,
- char terminator = '\n',
- int discard_terminator = 1);
+ char terminator,
+ int discard_terminator);
// Status
unsigned int length() const;
@@ -892,6 +892,15 @@
typedef string strTmp; // for backward compatibility
#endif
+string common_prefix(const string& x, const string& y,
+ int startpos = 0);
+string common_suffix(const string& x, const string& y,
+ int startpos = -1);
+
+int readline(std::istream& s, string& x,
+ char terminator = '\n',
+ int discard_terminator = 1);
+
// Other externs
int compare(const string& x, const string& y);