diff options
| -rw-r--r-- | config.h.in | 2 | ||||
| -rw-r--r-- | lib-rpmrc.in | 5 | ||||
| -rw-r--r-- | lib/package.c | 3 | ||||
| -rw-r--r-- | lib/rpmlead.c | 3 | ||||
| -rw-r--r-- | misc/inet_aton.c | 1 | ||||
| -rw-r--r-- | misc/miscfn.h | 7 |
6 files changed, 17 insertions, 4 deletions
diff --git a/config.h.in b/config.h.in index f1bd05981..d08d1e876 100644 --- a/config.h.in +++ b/config.h.in @@ -17,7 +17,7 @@ #define HAVE_LIMITS_H 0 /* Define as 1 if you have <machine/types.h> */ -#define MACHINE_TYPES_H 0 +#define HAVE_MACHINE_TYPES_H 0 /* Define as 1 if you have <sys/socket.h> */ #define HAVE_SYS_SOCKET_H 0 diff --git a/lib-rpmrc.in b/lib-rpmrc.in index 0d52f0e20..5a038422d 100644 --- a/lib-rpmrc.in +++ b/lib-rpmrc.in @@ -21,6 +21,8 @@ optflags: alpha -O2 optflags: sparc -O2 optflags: m68k -O2 -fomit-frame-pointer optflags: ppc -O2 -fsigned-char +optflags: hppa1.0 -O2 -mpa-risc-1-0 +optflags: hppa1.1 -O2 -mpa-risc-1-0 ############################################################# # Canonical arch names and numbers @@ -118,6 +120,9 @@ arch_compat: sparc: noarch arch_compat: ppc: noarch arch_compat: mips: noarch +arch_compat: hppa1.1: hppa1.0 +arch_compat: hppa1.0: noarch + os_compat: IRIX64: IRIX buildarch_compat: i986: i886 diff --git a/lib/package.c b/lib/package.c index 4830fe3c3..9e288dc66 100644 --- a/lib/package.c +++ b/lib/package.c @@ -1,3 +1,6 @@ +#include "config.h" +#include "miscfn.h" + #include <fcntl.h> #include <netinet/in.h> #include <stdlib.h> diff --git a/lib/rpmlead.c b/lib/rpmlead.c index e675ded6d..353c195e1 100644 --- a/lib/rpmlead.c +++ b/lib/rpmlead.c @@ -1,3 +1,6 @@ +#include "config.h" +#include "miscfn.h" + #ifdef HAVE_MACHINE_TYPES_H # include <machine/types.h> #endif diff --git a/misc/inet_aton.c b/misc/inet_aton.c index 232e930e8..a5c3206d2 100644 --- a/misc/inet_aton.c +++ b/misc/inet_aton.c @@ -1,4 +1,5 @@ #include "config.h" +#include "miscfn.h" #ifdef HAVE_NETINET_IN_SYSTM_H # include <sys/types.h> diff --git a/misc/miscfn.h b/misc/miscfn.h index 7365d2294..8b21c68da 100644 --- a/misc/miscfn.h +++ b/misc/miscfn.h @@ -16,15 +16,15 @@ #endif #if ! HAVE_S_IFSOCK -#define S_IFSOCK (0) +#define S_IFSOCK (0xC000) #endif #if ! HAVE_S_ISLNK -#define S_ISLNK(mode) ((mode) & S_IFLNK) +#define S_ISLNK(mode) ((mode & 0xF000) == S_IFLNK) #endif #if ! HAVE_S_ISSOCK -#define S_ISSOCK(mode) ((mode) & S_IFSOCK) +#define S_ISSOCK(mode) ((mode & 0xF000) == S_IFSOCK) #endif #if NEED_STRINGS_H @@ -47,6 +47,7 @@ extern void *myrealloc(void *, size_t); #endif #if HAVE_SYS_SOCKET_H +#include <sys/types.h> #include <sys/socket.h> #endif |