projects
/
gnulib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b3024d9
)
Incorporate weak-alias-related changes from glibc.
author
Jim Meyering
<jim@meyering.net>
Thu, 16 Nov 2000 10:15:54 +0000
(10:15 +0000)
committer
Jim Meyering
<jim@meyering.net>
Thu, 16 Nov 2000 10:15:54 +0000
(10:15 +0000)
lib/strverscmp.c
patch
|
blob
|
history
diff --git
a/lib/strverscmp.c
b/lib/strverscmp.c
index
830a545
..
c920bd7
100644
(file)
--- a/
lib/strverscmp.c
+++ b/
lib/strverscmp.c
@@
-26,7
+26,7
@@
#include <ctype.h>
/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
#include <ctype.h>
/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
-
F
ractional parts, S_Z: idem but with leading Zeroes only */
+
f
ractional parts, S_Z: idem but with leading Zeroes only */
#define S_N 0x0
#define S_I 0x4
#define S_F 0x8
#define S_N 0x0
#define S_I 0x4
#define S_F 0x8
@@
-36,6
+36,7
@@
#define CMP 2
#define LEN 3
#define CMP 2
#define LEN 3
+
/* ISDIGIT differs from isdigit, as follows:
- Its arg may be any int or unsigned int; it need not be an unsigned char.
- It's guaranteed to evaluate its argument exactly once.
/* ISDIGIT differs from isdigit, as follows:
- Its arg may be any int or unsigned int; it need not be an unsigned char.
- It's guaranteed to evaluate its argument exactly once.
@@
-46,13
+47,20
@@
host does not conform to Posix. */
#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
host does not conform to Posix. */
#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
+#undef __strverscmp
+#undef strverscmp
+
+#ifndef weak_alias
+# define __strverscmp strverscmp
+#endif
+
/* Compare S1 and S2 as strings holding indices/version numbers,
returning less than, equal to or greater than zero if S1 is less than,
equal to or greater than S2 (for more info, see the texinfo doc).
*/
int
/* Compare S1 and S2 as strings holding indices/version numbers,
returning less than, equal to or greater than zero if S1 is less than,
equal to or greater than S2 (for more info, see the texinfo doc).
*/
int
-strverscmp (const char *s1, const char *s2)
+
__
strverscmp (const char *s1, const char *s2)
{
const unsigned char *p1 = (const unsigned char *) s1;
const unsigned char *p2 = (const unsigned char *) s2;
{
const unsigned char *p1 = (const unsigned char *) s1;
const unsigned char *p2 = (const unsigned char *) s2;
@@
-120,3
+128,6
@@
strverscmp (const char *s1, const char *s2)
return state;
}
}
return state;
}
}
+#ifdef weak_alias
+weak_alias (__strverscmp, strverscmp)
+#endif