projects
/
debian
/
tar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import upstream version 1.27
[debian/tar]
/
gnu
/
xsize.h
diff --git
a/gnu/xsize.h
b/gnu/xsize.h
index 5f980ca60dd94c4d1494a16d3e5fc44dcbf261f7..a0bd76650e104dd4df02056db3bcc14ac40ddce4 100644
(file)
--- a/
gnu/xsize.h
+++ b/
gnu/xsize.h
@@
-2,7
+2,7
@@
/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
/* xsize.h -- Checked size_t computations.
/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
/* xsize.h -- Checked size_t computations.
- Copyright (C) 2003, 2008-201
1
Free Software Foundation, Inc.
+ Copyright (C) 2003, 2008-201
3
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
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
@@
-15,8
+15,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/>. */
#ifndef _XSIZE_H
#define _XSIZE_H
#ifndef _XSIZE_H
#define _XSIZE_H
@@
-30,6
+29,11
@@
# include <stdint.h>
#endif
# include <stdint.h>
#endif
+_GL_INLINE_HEADER_BEGIN
+#ifndef XSIZE_INLINE
+# define XSIZE_INLINE _GL_INLINE
+#endif
+
/* The size of memory objects is often computed through expressions of
type size_t. Example:
void* p = malloc (header_size + n * element_size).
/* The size of memory objects is often computed through expressions of
type size_t. Example:
void* p = malloc (header_size + n * element_size).
@@
-51,7
+55,7
@@
((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
/* Sum of two sizes, with overflow check. */
((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
/* Sum of two sizes, with overflow check. */
-
static inline
size_t
+
XSIZE_INLINE
size_t
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
@@
-62,7
+66,7
@@
xsum (size_t size1, size_t size2)
}
/* Sum of three sizes, with overflow check. */
}
/* Sum of three sizes, with overflow check. */
-
static inline
size_t
+
XSIZE_INLINE
size_t
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
@@
-72,7
+76,7
@@
xsum3 (size_t size1, size_t size2, size_t size3)
}
/* Sum of four sizes, with overflow check. */
}
/* Sum of four sizes, with overflow check. */
-
static inline
size_t
+
XSIZE_INLINE
size_t
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
@@
-82,7
+86,7
@@
xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
}
/* Maximum of two sizes, with overflow check. */
}
/* Maximum of two sizes, with overflow check. */
-
static inline
size_t
+
XSIZE_INLINE
size_t
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
@@
-95,7
+99,7
@@
xmax (size_t size1, size_t size2)
/* Multiplication of a count with an element size, with overflow check.
The count must be >= 0 and the element size must be > 0.
/* Multiplication of a count with an element size, with overflow check.
The count must be >= 0 and the element size must be > 0.
- This is a macro, not a
n inline
function, so that it works correctly even
+ This is a macro, not a function, so that it works correctly even
when N is of a wider type and N > SIZE_MAX. */
#define xtimes(N, ELSIZE) \
((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
when N is of a wider type and N > SIZE_MAX. */
#define xtimes(N, ELSIZE) \
((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
@@
-107,4
+111,6
@@
xmax (size_t size1, size_t size2)
#define size_in_bounds_p(SIZE) \
((SIZE) != SIZE_MAX)
#define size_in_bounds_p(SIZE) \
((SIZE) != SIZE_MAX)
+_GL_INLINE_HEADER_END
+
#endif /* _XSIZE_H */
#endif /* _XSIZE_H */