* [PATCH 1/4] Remove dependencies with absolute path
@ 2006-06-13 4:32 Pavel Roskin
2006-06-13 4:32 ` [PATCH 2/4] Trivial compile fix for cache.c Pavel Roskin
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Pavel Roskin @ 2006-06-13 4:32 UTC (permalink / raw)
To: Yann Dirson, git, cvsps
From: Pavel Roskin <proski@gnu.org>
Not everybody has headers in the same locations and not everybody uses
gcc 3.3.6. Only leave dependencies with relative path.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
Makefile | 213 ++++----------------------------------------------------------
1 files changed, 14 insertions(+), 199 deletions(-)
diff --git a/Makefile b/Makefile
index 1257ae7..cc277e2 100644
--- a/Makefile
+++ b/Makefile
@@ -38,218 +38,33 @@ clean:
.PHONY: install clean
# DO NOT DELETE
-cache.o: /usr/include/stdio.h /usr/include/features.h
-cache.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cache.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cache.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cache.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cache.o: /usr/include/_G_config.h /usr/include/wchar.h
-cache.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cache.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cache.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-cache.o: /usr/include/search.h /usr/include/string.h /usr/include/stdlib.h
-cache.o: /usr/include/limits.h
-cache.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-cache.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-cache.o: /usr/include/bits/confname.h /usr/include/ctype.h
-cache.o: /usr/include/endian.h /usr/include/bits/endian.h /usr/include/time.h
-cache.o: /usr/include/bits/time.h ./cbtcommon/hash.h ./cbtcommon/list.h
-cache.o: ./cbtcommon/inline.h ./cbtcommon/debug.h /usr/include/sys/types.h
+cache.o: ./cbtcommon/hash.h ./cbtcommon/list.h
+cache.o: ./cbtcommon/inline.h ./cbtcommon/debug.h
cache.o: cache.h cvsps_types.h cvsps.h util.h
-cap.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
-cap.o: /usr/include/gnu/stubs.h
-cap.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cap.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cap.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cap.o: /usr/include/_G_config.h /usr/include/wchar.h
-cap.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cap.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cap.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-cap.o: /usr/include/stdlib.h /usr/include/string.h ./cbtcommon/debug.h
-cap.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/bits/time.h
+cap.o: ./cbtcommon/debug.h
cap.o: ./cbtcommon/inline.h ./cbtcommon/text_util.h cap.h cvs_direct.h
-cvs_direct.o: /usr/include/string.h /usr/include/features.h
-cvs_direct.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cvs_direct.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cvs_direct.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-cvs_direct.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cvs_direct.o: /usr/include/bits/typesizes.h /usr/include/bits/confname.h
-cvs_direct.o: /usr/include/stdlib.h /usr/include/limits.h
-cvs_direct.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-cvs_direct.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cvs_direct.o: /usr/include/zlib.h /usr/include/zconf.h
-cvs_direct.o: /usr/include/sys/types.h /usr/include/time.h
-cvs_direct.o: /usr/include/bits/time.h /usr/include/sys/socket.h
-cvs_direct.o: /usr/include/sys/uio.h /usr/include/bits/uio.h
-cvs_direct.o: /usr/include/bits/socket.h /usr/include/bits/sockaddr.h
-cvs_direct.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h
-cvs_direct.o: ./cbtcommon/debug.h /usr/include/stdio.h /usr/include/libio.h
-cvs_direct.o: /usr/include/_G_config.h /usr/include/wchar.h
-cvs_direct.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cvs_direct.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+cvs_direct.o: ./cbtcommon/debug.h
cvs_direct.o: ./cbtcommon/inline.h ./cbtcommon/text_util.h
cvs_direct.o: ./cbtcommon/tcpsocket.h ./cbtcommon/sio.h cvs_direct.h util.h
-cvsps.o: /usr/include/stdio.h /usr/include/features.h
-cvsps.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cvsps.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cvsps.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cvsps.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cvsps.o: /usr/include/_G_config.h /usr/include/wchar.h
-cvsps.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cvsps.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cvsps.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-cvsps.o: /usr/include/stdlib.h /usr/include/string.h /usr/include/limits.h
-cvsps.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-cvsps.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-cvsps.o: /usr/include/bits/confname.h /usr/include/search.h
-cvsps.o: /usr/include/time.h /usr/include/bits/time.h /usr/include/ctype.h
-cvsps.o: /usr/include/endian.h /usr/include/bits/endian.h
-cvsps.o: /usr/include/sys/stat.h /usr/include/bits/stat.h
-cvsps.o: /usr/include/sys/types.h /usr/include/fcntl.h
-cvsps.o: /usr/include/bits/fcntl.h /usr/include/regex.h
-cvsps.o: /usr/include/sys/wait.h /usr/include/signal.h
-cvsps.o: /usr/include/bits/sigset.h /usr/include/bits/signum.h
-cvsps.o: /usr/include/sys/resource.h /usr/include/bits/resource.h
-cvsps.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
cvsps.o: ./cbtcommon/hash.h ./cbtcommon/list.h ./cbtcommon/inline.h
cvsps.o: ./cbtcommon/list.h ./cbtcommon/text_util.h ./cbtcommon/debug.h
cvsps.o: ./cbtcommon/rcsid.h cache.h cvsps_types.h cvsps.h util.h stats.h
cvsps.o: cap.h cvs_direct.h list_sort.h
-list_sort.o: /usr/include/stdio.h /usr/include/features.h
-list_sort.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-list_sort.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-list_sort.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-list_sort.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-list_sort.o: /usr/include/_G_config.h /usr/include/wchar.h
-list_sort.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-list_sort.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-list_sort.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-list_sort.o: /usr/include/stdlib.h list_sort.h ./cbtcommon/list.h
-stats.o: /usr/include/stdio.h /usr/include/features.h
-stats.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-stats.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-stats.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-stats.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-stats.o: /usr/include/_G_config.h /usr/include/wchar.h
-stats.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-stats.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-stats.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-stats.o: /usr/include/string.h /usr/include/search.h ./cbtcommon/hash.h
+list_sort.o: list_sort.h ./cbtcommon/list.h
+stats.o: ./cbtcommon/hash.h
stats.o: ./cbtcommon/list.h ./cbtcommon/inline.h cvsps_types.h
-stats.o: /usr/include/time.h /usr/include/bits/time.h cvsps.h
-util.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
-util.o: /usr/include/gnu/stubs.h
-util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-util.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-util.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-util.o: /usr/include/_G_config.h /usr/include/wchar.h
-util.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-util.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-util.o: /usr/include/string.h /usr/include/stdlib.h /usr/include/unistd.h
-util.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h
-util.o: /usr/include/limits.h
-util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-util.o: /usr/include/assert.h /usr/include/search.h /usr/include/time.h
-util.o: /usr/include/bits/time.h /usr/include/errno.h
-util.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
-util.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h
-util.o: /usr/include/asm-generic/errno-base.h /usr/include/signal.h
-util.o: /usr/include/bits/sigset.h /usr/include/bits/signum.h
-util.o: /usr/include/regex.h /usr/include/sys/types.h /usr/include/sys/stat.h
-util.o: /usr/include/bits/stat.h /usr/include/sys/time.h
-util.o: /usr/include/sys/select.h /usr/include/bits/select.h
-util.o: /usr/include/sys/wait.h /usr/include/sys/resource.h
-util.o: /usr/include/bits/resource.h /usr/include/bits/waitflags.h
-util.o: /usr/include/bits/waitstatus.h ./cbtcommon/debug.h
+stats.o: cvsps.h
+util.o: ./cbtcommon/debug.h
util.o: ./cbtcommon/inline.h util.h
-cbtcommon/debug.o: /usr/include/stdio.h /usr/include/features.h
-cbtcommon/debug.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/debug.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/debug.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cbtcommon/debug.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cbtcommon/debug.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/debug.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cbtcommon/debug.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/debug.o: /usr/include/bits/stdio_lim.h
-cbtcommon/debug.o: /usr/include/bits/sys_errlist.h /usr/include/errno.h
-cbtcommon/debug.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
-cbtcommon/debug.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h
-cbtcommon/debug.o: /usr/include/asm-generic/errno-base.h /usr/include/ctype.h
-cbtcommon/debug.o: /usr/include/endian.h /usr/include/bits/endian.h
-cbtcommon/debug.o: /usr/include/string.h cbtcommon/debug.h
-cbtcommon/debug.o: /usr/include/sys/types.h /usr/include/time.h
-cbtcommon/debug.o: /usr/include/bits/time.h ./cbtcommon/inline.h
+cbtcommon/debug.o: cbtcommon/debug.h
+cbtcommon/debug.o: ./cbtcommon/inline.h
cbtcommon/debug.o: cbtcommon/rcsid.h
-cbtcommon/hash.o: /usr/include/stdio.h /usr/include/features.h
-cbtcommon/hash.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/hash.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/hash.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cbtcommon/hash.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cbtcommon/hash.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/hash.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cbtcommon/hash.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/hash.o: /usr/include/bits/stdio_lim.h
-cbtcommon/hash.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
-cbtcommon/hash.o: /usr/include/string.h cbtcommon/debug.h
-cbtcommon/hash.o: /usr/include/sys/types.h /usr/include/time.h
-cbtcommon/hash.o: /usr/include/bits/time.h ./cbtcommon/inline.h
+cbtcommon/hash.o: cbtcommon/debug.h
+cbtcommon/hash.o: ./cbtcommon/inline.h
cbtcommon/hash.o: cbtcommon/hash.h ./cbtcommon/list.h cbtcommon/rcsid.h
-cbtcommon/sio.o: /usr/include/stdio.h /usr/include/features.h
-cbtcommon/sio.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/sio.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/sio.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cbtcommon/sio.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cbtcommon/sio.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/sio.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cbtcommon/sio.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/sio.o: /usr/include/bits/stdio_lim.h
-cbtcommon/sio.o: /usr/include/bits/sys_errlist.h /usr/include/unistd.h
-cbtcommon/sio.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h
-cbtcommon/sio.o: /usr/include/errno.h /usr/include/bits/errno.h
-cbtcommon/sio.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
-cbtcommon/sio.o: /usr/include/asm-generic/errno.h
-cbtcommon/sio.o: /usr/include/asm-generic/errno-base.h cbtcommon/sio.h
+cbtcommon/sio.o: cbtcommon/sio.h
cbtcommon/sio.o: cbtcommon/rcsid.h
-cbtcommon/tcpsocket.o: /usr/include/string.h /usr/include/features.h
-cbtcommon/tcpsocket.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/tcpsocket.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/tcpsocket.o: /usr/include/sys/types.h /usr/include/bits/types.h
-cbtcommon/tcpsocket.o: /usr/include/bits/wordsize.h
-cbtcommon/tcpsocket.o: /usr/include/bits/typesizes.h /usr/include/time.h
-cbtcommon/tcpsocket.o: /usr/include/bits/time.h /usr/include/sys/socket.h
-cbtcommon/tcpsocket.o: /usr/include/sys/uio.h /usr/include/bits/uio.h
-cbtcommon/tcpsocket.o: /usr/include/bits/socket.h /usr/include/limits.h
-cbtcommon/tcpsocket.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-cbtcommon/tcpsocket.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h
-cbtcommon/tcpsocket.o: /usr/include/asm/sockios.h /usr/include/netinet/in.h
-cbtcommon/tcpsocket.o: /usr/include/stdint.h /usr/include/bits/wchar.h
-cbtcommon/tcpsocket.o: /usr/include/bits/in.h /usr/include/endian.h
-cbtcommon/tcpsocket.o: /usr/include/bits/endian.h
-cbtcommon/tcpsocket.o: /usr/include/bits/byteswap.h /usr/include/arpa/inet.h
-cbtcommon/tcpsocket.o: /usr/include/netdb.h /usr/include/bits/netdb.h
-cbtcommon/tcpsocket.o: /usr/include/errno.h /usr/include/bits/errno.h
-cbtcommon/tcpsocket.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
-cbtcommon/tcpsocket.o: /usr/include/asm-generic/errno.h
-cbtcommon/tcpsocket.o: /usr/include/asm-generic/errno-base.h
cbtcommon/tcpsocket.o: cbtcommon/tcpsocket.h cbtcommon/debug.h
-cbtcommon/tcpsocket.o: /usr/include/stdio.h /usr/include/libio.h
-cbtcommon/tcpsocket.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/tcpsocket.o: /usr/include/gconv.h
-cbtcommon/tcpsocket.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/tcpsocket.o: /usr/include/bits/stdio_lim.h
-cbtcommon/tcpsocket.o: /usr/include/bits/sys_errlist.h ./cbtcommon/inline.h
+cbtcommon/tcpsocket.o: ./cbtcommon/inline.h
cbtcommon/tcpsocket.o: cbtcommon/rcsid.h
-cbtcommon/text_util.o: /usr/include/ctype.h /usr/include/features.h
-cbtcommon/text_util.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/text_util.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cbtcommon/text_util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/text_util.o: /usr/include/bits/typesizes.h /usr/include/endian.h
-cbtcommon/text_util.o: /usr/include/bits/endian.h /usr/include/string.h
-cbtcommon/text_util.o: /usr/include/stdio.h /usr/include/libio.h
-cbtcommon/text_util.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/text_util.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cbtcommon/text_util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/text_util.o: /usr/include/bits/stdio_lim.h
-cbtcommon/text_util.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
cbtcommon/text_util.o: cbtcommon/text_util.h cbtcommon/rcsid.h
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/4] Trivial compile fix for cache.c
2006-06-13 4:32 [PATCH 1/4] Remove dependencies with absolute path Pavel Roskin
@ 2006-06-13 4:32 ` Pavel Roskin
2006-06-13 4:32 ` [PATCH 3/4] Use __linux__ conditional, not LINUX Pavel Roskin
2006-06-13 4:32 ` [PATCH 4/4] Use INADDR_NONE instead of -1 to check inet_addr() result Pavel Roskin
2 siblings, 0 replies; 4+ messages in thread
From: Pavel Roskin @ 2006-06-13 4:32 UTC (permalink / raw)
To: Yann Dirson, git, cvsps
From: Pavel Roskin <proski@gnu.org>
"tagnames" was renamed to "link", fix the last occurrence of "tagnames".
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
cache.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cache.c b/cache.c
index 409392d..07e5d02 100644
--- a/cache.c
+++ b/cache.c
@@ -501,7 +501,7 @@ static void dump_patch_set(FILE * fp, Pa
struct list_head * tag;
for (tag = ps->tags.next; tag != &ps->tags; tag = tag->next)
{
- TagName* tagname = list_entry (tag, TagName, tagnames);
+ TagName* tagname = list_entry (tag, TagName, link);
fprintf(fp, " %s %d%s", tagname->name, tagname->flags,
(tag->next == &ps->tags) ? "" : ",");
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/4] Use __linux__ conditional, not LINUX.
2006-06-13 4:32 [PATCH 1/4] Remove dependencies with absolute path Pavel Roskin
2006-06-13 4:32 ` [PATCH 2/4] Trivial compile fix for cache.c Pavel Roskin
@ 2006-06-13 4:32 ` Pavel Roskin
2006-06-13 4:32 ` [PATCH 4/4] Use INADDR_NONE instead of -1 to check inet_addr() result Pavel Roskin
2 siblings, 0 replies; 4+ messages in thread
From: Pavel Roskin @ 2006-06-13 4:32 UTC (permalink / raw)
To: Yann Dirson, git, cvsps
From: Pavel Roskin <proski@gnu.org>
__linux__ is defined automatically, LINUX is not.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
cbtcommon/tcpsocket.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
index 27cc13a..a174007 100644
--- a/cbtcommon/tcpsocket.c
+++ b/cbtcommon/tcpsocket.c
@@ -185,14 +185,14 @@ #endif
int
convert_address(long *dest, const char *addr_str)
{
-#ifdef LINUX
+#ifdef __linux__
struct in_addr ip;
#endif
int retval = 0;
char errstr[256];
/* first try converting "numbers and dots" notation */
-#ifdef LINUX
+#ifdef __linux__
if ( inet_aton(addr_str, &ip) )
{
memcpy(dest, &ip.s_addr, sizeof(ip.s_addr));
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 4/4] Use INADDR_NONE instead of -1 to check inet_addr() result
2006-06-13 4:32 [PATCH 1/4] Remove dependencies with absolute path Pavel Roskin
2006-06-13 4:32 ` [PATCH 2/4] Trivial compile fix for cache.c Pavel Roskin
2006-06-13 4:32 ` [PATCH 3/4] Use __linux__ conditional, not LINUX Pavel Roskin
@ 2006-06-13 4:32 ` Pavel Roskin
2 siblings, 0 replies; 4+ messages in thread
From: Pavel Roskin @ 2006-06-13 4:32 UTC (permalink / raw)
To: Yann Dirson, git, cvsps
From: Pavel Roskin <proski@gnu.org>
INADDR_NONE is not equal to -1 on 64-bit systems.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
cbtcommon/tcpsocket.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
index a174007..f31060e 100644
--- a/cbtcommon/tcpsocket.c
+++ b/cbtcommon/tcpsocket.c
@@ -198,7 +198,7 @@ #ifdef __linux__
memcpy(dest, &ip.s_addr, sizeof(ip.s_addr));
}
#else
- if ( (*dest = inet_addr(addr_str)) != -1)
+ if ( (*dest = inet_addr(addr_str)) != INADDR_NONE)
{
/* nothing */
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-06-13 4:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-13 4:32 [PATCH 1/4] Remove dependencies with absolute path Pavel Roskin
2006-06-13 4:32 ` [PATCH 2/4] Trivial compile fix for cache.c Pavel Roskin
2006-06-13 4:32 ` [PATCH 3/4] Use __linux__ conditional, not LINUX Pavel Roskin
2006-06-13 4:32 ` [PATCH 4/4] Use INADDR_NONE instead of -1 to check inet_addr() result Pavel Roskin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).