Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
76d0e68f
Commit
76d0e68f
authored
Aug 13, 2012
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge from gnulib.
This incorporates: 2012-08-05 extern-inline: also ignore -Wmissing-declarations
parent
5884c324
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
6 deletions
+17
-6
ChangeLog
ChangeLog
+5
-0
doc/misc/texinfo.tex
doc/misc/texinfo.tex
+10
-5
m4/extern-inline.m4
m4/extern-inline.m4
+2
-1
No files found.
ChangeLog
View file @
76d0e68f
2012-08-14 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2012-08-05 extern-inline: also ignore -Wmissing-declarations
2012-08-10 Juanma Barranquero <lekktu@gmail.com>
* lib/makefile.w32-in (STAT_TIME_H): New macro.
...
...
doc/misc/texinfo.tex
View file @
76d0e68f
...
...
@@ -3146,12 +3146,17 @@
% hopefully nobody will notice/care.
\edef\ecsize
{
\csname\curfontsize
ecsize
\endcsname
}
%
\edef\nominalsize
{
\csname\curfontsize
nominalsize
\endcsname
}
%
\if
x\curfontstyle\bfstylenam
e
%
bold
:
\font\thisecfont
= ec
b
\ifusingit
{
i
}{
x
}
\ecsize
\space
at
\nominalsize
\if
monospac
e
%
typewriter
:
\font\thisecfont
= ec
tt
\ecsize
\space
at
\nominalsize
\else
% regular:
\font\thisecfont
= ec
\ifusingit
{
ti
}{
rm
}
\ecsize
\space
at
\nominalsize
\ifx\curfontstyle\bfstylename
% bold:
\font\thisecfont
= ecb
\ifusingit
{
i
}{
x
}
\ecsize
\space
at
\nominalsize
\else
% regular:
\font\thisecfont
= ec
\ifusingit
{
ti
}{
rm
}
\ecsize
\space
at
\nominalsize
\fi
\fi
\thisecfont
}
...
...
m4/extern-inline.m4
View file @
76d0e68f
...
...
@@ -24,7 +24,8 @@ AC_DEFUN([gl_EXTERN_INLINE],
# if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
# define _GL_INLINE_HEADER_BEGIN \
_Pragma ("GCC diagnostic push") \
_Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"")
_Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
_Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"")
# define _GL_INLINE_HEADER_END \
_Pragma ("GCC diagnostic pop")
# endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment