emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfetch: misc cleanups due to nbcompat removal.

Browse Source
This commit is contained in:
Juan RP 2014-12-28 03:34:36 +01:00
parent df1608d47d
commit b513a5e15e
6 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile
View File

@ -21,7 +21,7 @@ LIBPROP_CFLAGS += -fvisibility=hidden
# libfetch # libfetch
LIBFETCH_OBJS = fetch/common.o fetch/fetch.o fetch/file.o LIBFETCH_OBJS = fetch/common.o fetch/fetch.o fetch/file.o
LIBFETCH_OBJS += fetch/ftp.o fetch/http.o LIBFETCH_OBJS += fetch/ftp.o fetch/http.o
LIBFETCH_CPPFLAGS = -DFTP_COMBINE_CWDS -DNETBSD -DINET6 -DWITH_SSL LIBFETCH_CPPFLAGS = -DFTP_COMBINE_CWDS -DINET6 -DWITH_SSL
LIBFETCH_CFLAGS = -Wno-error -Wno-unused-macros -Wno-conversion LIBFETCH_CFLAGS = -Wno-error -Wno-unused-macros -Wno-conversion
ifdef HAVE_VISIBILITY ifdef HAVE_VISIBILITY
LIBFETCH_CFLAGS+= -fvisibility=hidden LIBFETCH_CFLAGS+= -fvisibility=hidden

8
lib/fetch/common.c
View File

@ -32,10 +32,6 @@
#include "compat.h" #include "compat.h"
#ifndef NETBSD
#include <nbcompat.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/time.h> #include <sys/time.h>
@ -49,11 +45,7 @@
#if defined(HAVE_INTTYPES_H) || defined(NETBSD) #if defined(HAVE_INTTYPES_H) || defined(NETBSD)
#include <inttypes.h> #include <inttypes.h>
#endif #endif
#ifndef NETBSD
#include <nbcompat/netdb.h>
#else
#include <netdb.h> #include <netdb.h>
#endif
#include <pwd.h> #include <pwd.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>

4
lib/fetch/fetch.c
View File

@ -32,10 +32,6 @@
#include "compat.h" #include "compat.h"
#ifndef NETBSD
#include <nbcompat.h>
#endif
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>

4
lib/fetch/file.c
View File

@ -32,10 +32,6 @@
#include "compat.h" #include "compat.h"
#ifndef NETBSD
#include <nbcompat.h>
#endif
#include <sys/stat.h> #include <sys/stat.h>
#include <dirent.h> #include <dirent.h>

9
lib/fetch/ftp.c
View File

@ -71,17 +71,10 @@
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#if defined(HAVE_INTTYPES_H) || defined(NETBSD)
#include <inttypes.h> #include <inttypes.h>
#endif
#include <stdarg.h> #include <stdarg.h>
#ifndef NETBSD
#include <nbcompat/netdb.h>
#include <nbcompat/stdio.h>
#else
#include <netdb.h> #include <netdb.h>
#include <stdio.h> #include <stdio.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
@ -154,7 +147,7 @@ unmappedaddr(struct sockaddr_in6 *sin6, socklen_t *len)
sin4->sin_port = port; sin4->sin_port = port;
sin4->sin_family = AF_INET; sin4->sin_family = AF_INET;
*len = sizeof(struct sockaddr_in); *len = sizeof(struct sockaddr_in);
#ifdef HAVE_SA_LEN #ifndef __linux__
sin4->sin_len = sizeof(struct sockaddr_in); sin4->sin_len = sizeof(struct sockaddr_in);
#endif #endif
} }

8
lib/fetch/http.c
View File

@ -79,11 +79,7 @@
#include <errno.h> #include <errno.h>
#include <locale.h> #include <locale.h>
#include <stdarg.h> #include <stdarg.h>
#ifndef NETBSD
#include <nbcompat/stdio.h>
#else
#include <stdio.h> #include <stdio.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
@ -92,11 +88,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#ifndef NETBSD
#include <nbcompat/netdb.h>
#else
#include <netdb.h> #include <netdb.h>
#endif
#include <arpa/inet.h> #include <arpa/inet.h>