diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-12-26 16:34:48 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-12-26 16:34:48 +0000 |
| commit | 190abe805aff69965ddc1ce23e435fc8ad8f7fa1 (patch) | |
| tree | 822aa6c842d07d6f8289f488c7a725276751189e | |
| parent | fd2b720db38832c75a746113a2486711f6a84b6d (diff) | |
| parent | 6daf81a9e3654619cbf0e11725f71645f78039b2 (diff) | |
| download | illumos-joyent-190abe805aff69965ddc1ce23e435fc8ad8f7fa1.tar.gz | |
[illumos-gate merge]
commit 6daf81a9e3654619cbf0e11725f71645f78039b2
4409 INET_ADDRSTRLEN, INET6_ADDRSTRLEN, in6addr_any not visible with -std=c99 -D_XOPEN_SOURCE=600
commit 07b48dbef2d1395c82edeccaf10e42ea7c0b6b36
4413 repository-metadata target should use "pkgrepo refresh" instead of "pkg.depotd"
| -rw-r--r-- | usr/src/pkg/Makefile | 6 | ||||
| -rw-r--r-- | usr/src/uts/common/netinet/in.h | 23 |
2 files changed, 18 insertions, 11 deletions
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile index 3514e03cb3..9d4eaada49 100644 --- a/usr/src/pkg/Makefile +++ b/usr/src/pkg/Makefile @@ -328,7 +328,7 @@ PKGLISTS= \ # # repository metadata (catalogs and search indices) # | -# | pkg.depotd +# | pkgrepo refresh # | # published packages # | | @@ -393,10 +393,8 @@ $(PDIR)/gendeps: $(DEP_SYNTH_PKGS) $(DEP_PKGS) install: $(ALL_TARGETS) repository-metadata repository-metadata: publish_pkgs - @print "Creating repository metadata" $(PKGDEBUG)for r in $(REPOS); do \ - /usr/lib/pkg.depotd -d $(PKGDEST)/repo.$$r \ - --add-content --exit-ready; \ + pkgrepo refresh -s $(PKGDEST)/repo.$$r; \ done # diff --git a/usr/src/uts/common/netinet/in.h b/usr/src/uts/common/netinet/in.h index b819f0dd39..d530b7f36e 100644 --- a/usr/src/uts/common/netinet/in.h +++ b/usr/src/uts/common/netinet/in.h @@ -1174,7 +1174,7 @@ typedef struct { } in_prefix_t; -#if !defined(_XPG4_2) || defined(__EXTENSIONS__) +#if !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) /* * IPv6 options */ @@ -1194,6 +1194,19 @@ typedef struct { /* argument type: struct ipv6_mreq */ #define IPV6_LEAVE_GROUP 0xa /* leave an IPv6 multicast group */ /* argument type: struct ipv6_mreq */ + +/* + * Other XPG6 constants. + */ +#define INET_ADDRSTRLEN 16 /* max len IPv4 addr in ascii dotted */ + /* decimal notation. */ +#define INET6_ADDRSTRLEN 46 /* max len of IPv6 addr in ascii */ + /* standard colon-hex notation. */ + +#endif /* !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) */ + +#if !defined(_XPG4_2) || defined(__EXTENSIONS__) + /* * IPV6_ADD_MEMBERSHIP and IPV6_DROP_MEMBERSHIP are being kept * for backward compatibility. They have the same meaning as IPV6_JOIN_GROUP @@ -1289,10 +1302,6 @@ typedef struct { /* * Miscellaneous IPv6 constants. */ -#define INET_ADDRSTRLEN 16 /* max len IPv4 addr in ascii dotted */ - /* decimal notation. */ -#define INET6_ADDRSTRLEN 46 /* max len of IPv6 addr in ascii */ - /* standard colon-hex notation. */ #define IPV6_PAD1_OPT 0 /* pad byte in IPv6 extension hdrs */ #endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */ @@ -1300,7 +1309,7 @@ typedef struct { /* * Extern declarations for pre-defined global const variables */ -#if !defined(_XPG4_2) || defined(__EXTENSIONS__) +#if !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) #ifndef _KERNEL #ifdef __STDC__ extern const struct in6_addr in6addr_any; @@ -1310,7 +1319,7 @@ extern struct in6_addr in6addr_any; extern struct in6_addr in6addr_loopback; #endif #endif -#endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */ +#endif /* !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) */ #ifdef __cplusplus } |