projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'
[gnulib.git]
/
lib
/
dummy.c
diff --git
a/lib/dummy.c
b/lib/dummy.c
index
dccb0ad
..
3a71161
100644
(file)
--- a/
lib/dummy.c
+++ b/
lib/dummy.c
@@
-1,10
+1,10
@@
/* A dummy file, to prevent empty libraries from breaking builds.
/* A dummy file, to prevent empty libraries from breaking builds.
- Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2007
, 2009-2014
Free Software Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ This program is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-12,9
+12,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create
libraries without any object files. You might get an error like:
/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create
libraries without any object files. You might get an error like:
@@
-36,7
+34,7
@@
#ifdef __sun
/* This declaration ensures that the library will export at least 1 symbol. */
#ifdef __sun
/* This declaration ensures that the library will export at least 1 symbol. */
-int
dummy
;
+int
gl_dummy_symbol
;
#else
/* This declaration is solely to ensure that after preprocessing
this file is never empty. */
#else
/* This declaration is solely to ensure that after preprocessing
this file is never empty. */