projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid macro redefinition warnings.
[gnulib.git]
/
lib
/
fileblocks.c
diff --git
a/lib/fileblocks.c
b/lib/fileblocks.c
index
136818a
..
822935a
100644
(file)
--- a/
lib/fileblocks.c
+++ b/
lib/fileblocks.c
@@
-1,10
+1,12
@@
/* Convert file size to number of blocks on System V-like machines.
/* Convert file size to number of blocks on System V-like machines.
- Copyright (C) 1990, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1990, 1997, 1998, 1999, 2004, 2005, 2006 Free Software
+ Foundation, Inc.
+
+ 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,14
+14,11
@@
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Brian L. Matthews, blm@6sceng.UUCP. */
/* Written by Brian L. Matthews, blm@6sceng.UUCP. */
-
\f
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+
+#include <config.h>
#include <sys/types.h>
#include <sys/types.h>
@@
-29,13
+28,11
@@
#if !HAVE_STRUCT_STAT_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
#if !HAVE_STRUCT_STAT_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
-# if HAVE_UNISTD_H
-# include <unistd.h>
-# endif
+# include <unistd.h>
# ifndef NINDIR
# ifndef NINDIR
-# if defined
(__DJGPP__)
+# if defined
__DJGPP__
typedef long daddr_t; /* for disk address */
# endif
typedef long daddr_t; /* for disk address */
# endif
@@
-73,5
+70,5
@@
st_blocks (off_t size)
#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. */
-
extern
int textutils_fileblocks_unused;
+
typedef
int textutils_fileblocks_unused;
#endif
#endif