1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114
|
Staging area for fixes needed by userland.
--- a/sys/ia64/include/_types.h
+++ b/sys/ia64/include/_types.h
@@ -74,7 +74,9 @@
typedef __int32_t __int_least32_t;
typedef __int64_t __int_least64_t;
typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
+#ifdef __FreeBSD__
typedef __int64_t __register_t;
+#endif
typedef __int64_t __segsz_t; /* segment size (in pages) */
typedef __uint64_t __size_t; /* sizeof() */
typedef __int64_t __ssize_t; /* byte count or error */
--- a/sys/mips/include/_types.h
+++ b/sys/mips/include/_types.h
@@ -94,10 +94,14 @@
typedef __int32_t __int_least32_t;
typedef __int64_t __int_least64_t;
#if defined(__mips_n64) || defined(__mips_n32)
+# ifdef __FreeBSD__
typedef __int64_t __register_t;
+# endif
typedef __int64_t f_register_t;
#else
+# ifdef __FreeBSD__
typedef __int32_t __register_t;
+# endif
typedef __int32_t f_register_t;
#endif
#ifdef __mips_n64
--- a/sys/powerpc/include/_types.h
+++ b/sys/powerpc/include/_types.h
@@ -94,7 +94,9 @@
typedef __int64_t __int_least64_t;
#ifdef __LP64__
typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
+#ifdef __FreeBSD__
typedef __int64_t __register_t;
+#endif
typedef __int64_t __segsz_t; /* segment size (in pages) */
typedef __uint64_t __size_t; /* sizeof() */
typedef __int64_t __ssize_t; /* byte count or error */
@@ -103,7 +105,9 @@
typedef __uint64_t __uintptr_t;
#else
typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
+#ifdef __FreeBSD__
typedef __int32_t __register_t;
+#endif
typedef __int32_t __segsz_t; /* segment size (in pages) */
typedef __uint32_t __size_t; /* sizeof() */
typedef __int32_t __ssize_t; /* byte count or error */
--- a/sys/sparc64/include/_types.h
+++ b/sys/sparc64/include/_types.h
@@ -70,7 +70,9 @@
typedef __int32_t __int_least32_t;
typedef __int64_t __int_least64_t;
typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
+#ifdef __FreeBSD__
typedef __int64_t __register_t;
+#endif
typedef __int64_t __segsz_t; /* segment size (in pages) */
typedef __uint64_t __size_t; /* sizeof() */
typedef __int64_t __ssize_t; /* byte count or error */
--- a/sys/sys/_timespec.h
+++ b/sys/sys/_timespec.h
@@ -41,9 +41,14 @@
#define _TIME_T_DECLARED
#endif
+#ifndef __FreeBSD__
+#define __need_timespec
+#include <time.h>
+#else
struct timespec {
time_t tv_sec; /* seconds */
long tv_nsec; /* and nanoseconds */
};
+#endif
#endif /* !_SYS__TIMESPEC_H_ */
--- a/sys/sys/_timeval.h
+++ b/sys/sys/_timeval.h
@@ -41,6 +41,10 @@
#define _TIME_T_DECLARED
#endif
+#ifndef __FreeBSD__
+#define __need_timeval
+#include <bits/time.h>
+#else
/*
* Structure returned by gettimeofday(2) system call, and used in other calls.
*/
@@ -48,5 +52,6 @@
time_t tv_sec; /* seconds */
suseconds_t tv_usec; /* and microseconds */
};
+#endif
#endif /* !_SYS__TIMEVAL_H_ */
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
@@ -39,10 +39,19 @@
typedef __int64_t __blkcnt_t; /* file block count */
typedef __int32_t __clockid_t; /* clock_gettime()... */
typedef __uint32_t __fflags_t; /* file flags */
+#if defined(__GLIBC__) && !defined(_KERNEL)
+/* User-selectable types. Leave them to Glibc headers. */
+#else
typedef __uint64_t __fsblkcnt_t;
typedef __uint64_t __fsfilcnt_t;
+#endif
typedef __uint32_t __gid_t;
+#if defined(__GLIBC__) && !defined(_KERNEL)
+/* This divergence is probably accidental, but it can't be fixed now. */
+typedef __uint32_t __id_t;
+#else
typedef __int64_t __id_t; /* can hold a gid_t, pid_t, or uid_t */
+#endif
typedef __uint32_t __ino_t; /* inode number */
typedef long __key_t; /* IPC key (for Sys V IPC) */
typedef __int32_t __lwpid_t; /* Thread ID (a.k.a. LWP) */
@@ -58,7 +67,11 @@
typedef __uint8_t __sa_family_t;
typedef __uint32_t __socklen_t;
typedef long __suseconds_t; /* microseconds (signed) */
+#if defined(__GLIBC__) && !defined(_KERNEL)
+typedef __int32_t __timer_t;
+#else
typedef struct __timer *__timer_t; /* timer_gettime()... */
+#endif
typedef struct __mq *__mqd_t; /* mq_open()... */
typedef __uint32_t __uid_t;
typedef unsigned int __useconds_t; /* microseconds (unsigned) */
@@ -107,9 +120,13 @@
* mbstate_t is an opaque object to keep conversion state during multibyte
* stream conversions.
*/
+#if defined(__GLIBC__) && !defined(_KERNEL)
+/* Defined in <wchar.h> */
+#else
typedef union {
char __mbstate8[128];
__int64_t _mbstateL; /* for alignment */
} __mbstate_t;
+#endif
#endif /* !_SYS__TYPES_H_ */
--- a/sys/sys/elf32.h
+++ b/sys/sys/elf32.h
@@ -31,15 +31,21 @@
#include <sys/elf_common.h>
+#ifndef __FreeBSD__
+#include <elf.h>
+#endif
+
/*
* ELF definitions common to all 32-bit architectures.
*/
+#ifdef __FreeBSD__
typedef uint32_t Elf32_Addr;
typedef uint16_t Elf32_Half;
typedef uint32_t Elf32_Off;
typedef int32_t Elf32_Sword;
typedef uint32_t Elf32_Word;
+#endif
typedef uint64_t Elf32_Lword;
typedef Elf32_Word Elf32_Hashelt;
@@ -48,6 +54,7 @@
typedef Elf32_Word Elf32_Size;
typedef Elf32_Sword Elf32_Ssize;
+#ifdef __FreeBSD__
/*
* ELF header.
*/
@@ -177,6 +184,8 @@
#define ELF32_M_SIZE(info) ((unsigned char)(info))
#define ELF32_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size))
+#endif
+
/*
* Hardware/Software capabilities entry
*/
@@ -188,6 +197,7 @@
} c_un;
} Elf32_Cap;
+#ifdef __FreeBSD__
/*
* Symbol table entries.
*/
@@ -246,12 +256,15 @@
Elf32_Word vna_name;
Elf32_Word vna_next;
} Elf32_Vernaux;
+#endif
typedef Elf32_Half Elf32_Versym;
+#ifdef __FreeBSD__
typedef struct {
Elf32_Half si_boundto; /* direct bindings - symbol bound to */
Elf32_Half si_flags; /* per symbol flags */
} Elf32_Syminfo;
+#endif
#endif /* !_SYS_ELF32_H_ */
--- a/sys/sys/elf64.h
+++ b/sys/sys/elf64.h
@@ -31,18 +31,26 @@
#include <sys/elf_common.h>
+#ifndef __FreeBSD__
+#include <elf.h>
+#endif
+
/*
* ELF definitions common to all 64-bit architectures.
*/
+#ifdef __FreeBSD__
typedef uint64_t Elf64_Addr;
typedef uint16_t Elf64_Half;
typedef uint64_t Elf64_Off;
typedef int32_t Elf64_Sword;
typedef int64_t Elf64_Sxword;
typedef uint32_t Elf64_Word;
+#endif
typedef uint64_t Elf64_Lword;
+#ifdef __FreeBSD__
typedef uint64_t Elf64_Xword;
+#endif
/*
* Types of dynamic symbol hash table bucket and chain elements.
@@ -57,6 +65,7 @@
typedef Elf64_Xword Elf64_Size;
typedef Elf64_Sxword Elf64_Ssize;
+#ifdef __FreeBSD__
/*
* ELF header.
*/
@@ -184,6 +193,8 @@
#define ELF64_M_SIZE(info) ((unsigned char)(info))
#define ELF64_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size))
+#endif
+
/*
* Hardware/Software capabilities entry
*/
@@ -195,6 +206,7 @@
} c_un;
} Elf64_Cap;
+#ifdef __FreeBSD__
/*
* Symbol table entries.
*/
@@ -249,12 +261,15 @@
Elf64_Word vna_name;
Elf64_Word vna_next;
} Elf64_Vernaux;
+#endif
typedef Elf64_Half Elf64_Versym;
+#ifdef __FreeBSD__
typedef struct {
Elf64_Half si_boundto; /* direct bindings - symbol bound to */
Elf64_Half si_flags; /* per symbol flags */
} Elf64_Syminfo;
+#endif
#endif /* !_SYS_ELF64_H_ */
--- a/sys/sys/endian.h
+++ b/sys/sys/endian.h
@@ -53,6 +53,10 @@
#define _UINT64_T_DECLARED
#endif
+#if !defined(_KERNEL) && defined(__GLIBC__)
+/* Avoid conflicting (but functionally equivalent) definitions below. */
+#include <endian.h>
+#else
/*
* General byte order swapping functions.
*/
@@ -93,6 +97,7 @@
#define le32toh(x) bswap32((x))
#define le64toh(x) bswap64((x))
#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */
+#endif
/* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
--- a/sys/sys/limits.h
+++ b/sys/sys/limits.h
@@ -35,6 +35,11 @@
#include <sys/cdefs.h>
#include <machine/_limits.h>
+#ifndef __FreeBSD__
+#include <limits.h>
+#endif
+
+#ifdef __FreeBSD__
#define CHAR_BIT __CHAR_BIT /* number of bits in a char */
#define SCHAR_MAX __SCHAR_MAX /* max value for a signed char */
@@ -71,6 +76,7 @@
#if __POSIX_VISIBLE || __XSI_VISIBLE
#define SSIZE_MAX __SSIZE_MAX /* max value for an ssize_t */
#endif
+#endif /* 0 */
#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
#define SIZE_T_MAX __SIZE_T_MAX /* max value for a size_t */
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -40,9 +40,15 @@
#include <sys/_null.h>
+#ifndef __FreeBSD__
+#include <sys/param.h>
+#endif
+
+#ifdef __FreeBSD__
#define BSD 199506 /* System version (year & month). */
-#define BSD4_3 1
-#define BSD4_4 1
+#define BSD4_3 1
+#define BSD4_4 1
+#endif
/*
* __FreeBSD_version numbers are documented in the Porter's Handbook.
@@ -97,11 +103,15 @@
#include <sys/syslimits.h>
#define MAXCOMLEN 19 /* max command name remembered */
+#ifdef __FreeBSD__
#define MAXINTERP PATH_MAX /* max interpreter file name length */
+#endif
#define MAXLOGNAME 33 /* max login name length (incl. NUL) */
#define MAXUPRC CHILD_MAX /* max simultaneous processes */
#define NCARGS ARG_MAX /* max bytes for an exec function */
+#ifdef __FreeBSD__
#define NGROUPS (NGROUPS_MAX+1) /* max number groups */
+#endif
#define NOFILE OPEN_MAX /* max open files per process */
#define NOGROUP 65535 /* marker for empty group set member */
#define MAXHOSTNAMELEN 256 /* max hostname size */
@@ -138,7 +148,9 @@
#ifndef DEV_BSHIFT
#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
#endif
+#ifdef __FreeBSD__
#define DEV_BSIZE (1<<DEV_BSHIFT)
+#endif
#ifndef BLKDEV_IOSIZE
#define BLKDEV_IOSIZE PAGE_SIZE /* default block device I/O size */
@@ -214,9 +226,11 @@
#define PCATCH 0x100 /* OR'd with pri for tsleep to check signals */
#define PDROP 0x200 /* OR'd with pri to stop re-entry of interlock mutex */
+#ifdef __FreeBSD__
#define NZERO 0 /* default "nice" */
#define NBBY 8 /* number of bits in a byte */
+#endif
#define NBPW sizeof(int) /* number of bytes per word (integer) */
#define CMASK 022 /* default file mask: S_IWGRP|S_IWOTH */
@@ -276,6 +290,7 @@
#define MAXPATHLEN PATH_MAX
#define MAXSYMLINKS 32
+#ifdef __FreeBSD__
/* Bit map related macros. */
#define setbit(a,i) (((unsigned char *)(a))[(i)/NBBY] |= 1<<((i)%NBBY))
#define clrbit(a,i) (((unsigned char *)(a))[(i)/NBBY] &= ~(1<<((i)%NBBY)))
@@ -283,6 +298,7 @@
(((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY)))
#define isclr(a,i) \
((((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
+#endif
/* Macros for counting and rounding. */
#ifndef howmany
@@ -291,9 +307,13 @@
#define nitems(x) (sizeof((x)) / sizeof((x)[0]))
#define rounddown(x, y) (((x)/(y))*(y))
#define rounddown2(x, y) ((x)&(~((y)-1))) /* if y is power of two */
+#ifdef __FreeBSD__
#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) /* to any y */
+#endif
#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
+#ifdef __FreeBSD__
#define powerof2(x) ((((x)-1)&(x))==0)
+#endif
/* Macros for min/max. */
#define MIN(a,b) (((a)<(b))?(a):(b))
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -30,8 +30,12 @@
* $FreeBSD$
*/
-#ifndef _SYS_QUEUE_H_
-#define _SYS_QUEUE_H_
+#ifndef __SYS_QUEUE_H_
+#define __SYS_QUEUE_H_
+
+#ifndef __FreeBSD__
+#include <sys/queue.h>
+#endif
#include <sys/cdefs.h>
@@ -187,10 +191,12 @@
#define SLIST_FIRST(head) ((head)->slh_first)
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define SLIST_FOREACH(var, head, field) \
for ((var) = SLIST_FIRST((head)); \
(var); \
(var) = SLIST_NEXT((var), field))
+#endif
#define SLIST_FOREACH_FROM(var, head, field) \
for ((var) = ((var) ? (var) : SLIST_FIRST((head))); \
@@ -212,6 +218,7 @@
((var) = *(varp)) != NULL; \
(varp) = &SLIST_NEXT((var), field))
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define SLIST_INIT(head) do { \
SLIST_FIRST((head)) = NULL; \
} while (0)
@@ -225,9 +232,11 @@
SLIST_NEXT((elm), field) = SLIST_FIRST((head)); \
SLIST_FIRST((head)) = (elm); \
} while (0)
+#endif
#define SLIST_NEXT(elm, field) ((elm)->field.sle_next)
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define SLIST_REMOVE(head, elm, type, field) do { \
QMD_SAVELINK(oldnext, (elm)->field.sle_next); \
if (SLIST_FIRST((head)) == (elm)) { \
@@ -241,7 +250,9 @@
} \
TRASHIT(*oldnext); \
} while (0)
+#endif
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define SLIST_REMOVE_AFTER(elm, field) do { \
SLIST_NEXT(elm, field) = \
SLIST_NEXT(SLIST_NEXT(elm, field), field); \
@@ -250,6 +261,7 @@
#define SLIST_REMOVE_HEAD(head, field) do { \
SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \
} while (0)
+#endif
#define SLIST_SWAP(head1, head2, type) do { \
QUEUE_TYPEOF(type) *swap_first = SLIST_FIRST(head1); \
@@ -288,6 +300,7 @@
/*
* Singly-linked Tail queue functions.
*/
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define STAILQ_CONCAT(head1, head2) do { \
if (!STAILQ_EMPTY((head2))) { \
*(head1)->stqh_last = (head2)->stqh_first; \
@@ -295,36 +308,44 @@
STAILQ_INIT((head2)); \
} \
} while (0)
+#endif
#define STAILQ_EMPTY(head) ((head)->stqh_first == NULL)
#define STAILQ_FIRST(head) ((head)->stqh_first)
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define STAILQ_FOREACH(var, head, field) \
for((var) = STAILQ_FIRST((head)); \
(var); \
(var) = STAILQ_NEXT((var), field))
+#endif
#define STAILQ_FOREACH_FROM(var, head, field) \
for ((var) = ((var) ? (var) : STAILQ_FIRST((head))); \
(var); \
(var) = STAILQ_NEXT((var), field))
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define STAILQ_FOREACH_SAFE(var, head, field, tvar) \
for ((var) = STAILQ_FIRST((head)); \
(var) && ((tvar) = STAILQ_NEXT((var), field), 1); \
(var) = (tvar))
+#endif
#define STAILQ_FOREACH_FROM_SAFE(var, head, field, tvar) \
for ((var) = ((var) ? (var) : STAILQ_FIRST((head))); \
(var) && ((tvar) = STAILQ_NEXT((var), field), 1); \
(var) = (tvar))
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define STAILQ_INIT(head) do { \
STAILQ_FIRST((head)) = NULL; \
(head)->stqh_last = &STAILQ_FIRST((head)); \
} while (0)
+#endif
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) do { \
if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\
(head)->stqh_last = &STAILQ_NEXT((elm), field); \
@@ -342,6 +363,7 @@
*(head)->stqh_last = (elm); \
(head)->stqh_last = &STAILQ_NEXT((elm), field); \
} while (0)
+#endif
#define STAILQ_LAST(head, type, field) \
(STAILQ_EMPTY((head)) ? NULL : \
@@ -350,6 +372,7 @@
#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next)
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define STAILQ_REMOVE(head, elm, type, field) do { \
QMD_SAVELINK(oldnext, (elm)->field.stqe_next); \
if (STAILQ_FIRST((head)) == (elm)) { \
@@ -363,6 +386,7 @@
} \
TRASHIT(*oldnext); \
} while (0)
+#endif
#define STAILQ_REMOVE_AFTER(head, elm, field) do { \
if ((STAILQ_NEXT(elm, field) = \
@@ -370,11 +394,13 @@
(head)->stqh_last = &STAILQ_NEXT((elm), field); \
} while (0)
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define STAILQ_REMOVE_HEAD(head, field) do { \
if ((STAILQ_FIRST((head)) = \
STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL) \
(head)->stqh_last = &STAILQ_FIRST((head)); \
} while (0)
+#endif
#define STAILQ_SWAP(head1, head2, type) do { \
QUEUE_TYPEOF(type) *swap_first = STAILQ_FIRST(head1); \
@@ -451,30 +477,37 @@
#define LIST_FIRST(head) ((head)->lh_first)
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define LIST_FOREACH(var, head, field) \
for ((var) = LIST_FIRST((head)); \
(var); \
(var) = LIST_NEXT((var), field))
+#endif
#define LIST_FOREACH_FROM(var, head, field) \
for ((var) = ((var) ? (var) : LIST_FIRST((head))); \
(var); \
(var) = LIST_NEXT((var), field))
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define LIST_FOREACH_SAFE(var, head, field, tvar) \
for ((var) = LIST_FIRST((head)); \
(var) && ((tvar) = LIST_NEXT((var), field), 1); \
(var) = (tvar))
+#endif
#define LIST_FOREACH_FROM_SAFE(var, head, field, tvar) \
for ((var) = ((var) ? (var) : LIST_FIRST((head))); \
(var) && ((tvar) = LIST_NEXT((var), field), 1); \
(var) = (tvar))
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define LIST_INIT(head) do { \
LIST_FIRST((head)) = NULL; \
} while (0)
+#endif
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define LIST_INSERT_AFTER(listelm, elm, field) do { \
QMD_LIST_CHECK_NEXT(listelm, field); \
if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\
@@ -499,6 +532,7 @@
LIST_FIRST((head)) = (elm); \
(elm)->field.le_prev = &LIST_FIRST((head)); \
} while (0)
+#endif
#define LIST_NEXT(elm, field) ((elm)->field.le_next)
@@ -507,6 +541,7 @@
__containerof((elm)->field.le_prev, \
QUEUE_TYPEOF(type), field.le_next))
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define LIST_REMOVE(elm, field) do { \
QMD_SAVELINK(oldnext, (elm)->field.le_next); \
QMD_SAVELINK(oldprev, (elm)->field.le_prev); \
@@ -519,6 +554,7 @@
TRASHIT(*oldnext); \
TRASHIT(*oldprev); \
} while (0)
+#endif
#define LIST_SWAP(head1, head2, type, field) do { \
QUEUE_TYPEOF(type) *swap_tmp = LIST_FIRST(head1); \
@@ -533,29 +569,35 @@
/*
* Tail queue declarations.
*/
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define TAILQ_HEAD(name, type) \
struct name { \
struct type *tqh_first; /* first element */ \
struct type **tqh_last; /* addr of last next element */ \
TRACEBUF \
}
+#endif
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define TAILQ_CLASS_HEAD(name, type) \
struct name { \
class type *tqh_first; /* first element */ \
class type **tqh_last; /* addr of last next element */ \
TRACEBUF \
}
+#endif
#define TAILQ_HEAD_INITIALIZER(head) \
{ NULL, &(head).tqh_first, TRACEBUF_INITIALIZER }
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define TAILQ_ENTRY(type) \
struct { \
struct type *tqe_next; /* next element */ \
struct type **tqe_prev; /* address of previous next element */ \
TRACEBUF \
}
+#endif
#define TAILQ_CLASS_ENTRY(type) \
struct { \
@@ -598,6 +640,7 @@
#define QMD_TAILQ_CHECK_PREV(elm, field)
#endif /* (_KERNEL && INVARIANTS) */
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define TAILQ_CONCAT(head1, head2, field) do { \
if (!TAILQ_EMPTY(head2)) { \
*(head1)->tqh_last = (head2)->tqh_first; \
@@ -608,51 +651,61 @@
QMD_TRACE_HEAD(head2); \
} \
} while (0)
+#endif
#define TAILQ_EMPTY(head) ((head)->tqh_first == NULL)
#define TAILQ_FIRST(head) ((head)->tqh_first)
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define TAILQ_FOREACH(var, head, field) \
for ((var) = TAILQ_FIRST((head)); \
(var); \
(var) = TAILQ_NEXT((var), field))
+#endif
#define TAILQ_FOREACH_FROM(var, head, field) \
for ((var) = ((var) ? (var) : TAILQ_FIRST((head))); \
(var); \
(var) = TAILQ_NEXT((var), field))
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \
for ((var) = TAILQ_FIRST((head)); \
(var) && ((tvar) = TAILQ_NEXT((var), field), 1); \
(var) = (tvar))
+#endif
#define TAILQ_FOREACH_FROM_SAFE(var, head, field, tvar) \
for ((var) = ((var) ? (var) : TAILQ_FIRST((head))); \
(var) && ((tvar) = TAILQ_NEXT((var), field), 1); \
(var) = (tvar))
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define TAILQ_FOREACH_REVERSE(var, head, headname, field) \
for ((var) = TAILQ_LAST((head), headname); \
(var); \
(var) = TAILQ_PREV((var), headname, field))
+#endif
#define TAILQ_FOREACH_REVERSE_FROM(var, head, headname, field) \
for ((var) = ((var) ? (var) : TAILQ_LAST((head), headname)); \
(var); \
(var) = TAILQ_PREV((var), headname, field))
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar) \
for ((var) = TAILQ_LAST((head), headname); \
(var) && ((tvar) = TAILQ_PREV((var), headname, field), 1); \
(var) = (tvar))
+#endif
#define TAILQ_FOREACH_REVERSE_FROM_SAFE(var, head, headname, field, tvar) \
for ((var) = ((var) ? (var) : TAILQ_LAST((head), headname)); \
(var) && ((tvar) = TAILQ_PREV((var), headname, field), 1); \
(var) = (tvar))
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define TAILQ_INIT(head) do { \
TAILQ_FIRST((head)) = NULL; \
(head)->tqh_last = &TAILQ_FIRST((head)); \
@@ -706,6 +759,7 @@
QMD_TRACE_HEAD(head); \
QMD_TRACE_ELEM(&(elm)->field); \
} while (0)
+#endif
#define TAILQ_LAST(head, headname) \
(*(((struct headname *)((head)->tqh_last))->tqh_last))
@@ -715,6 +769,7 @@
#define TAILQ_PREV(elm, headname, field) \
(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define TAILQ_REMOVE(head, elm, field) do { \
QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \
QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \
@@ -732,6 +787,7 @@
TRASHIT(*oldprev); \
QMD_TRACE_ELEM(&(elm)->field); \
} while (0)
+#endif
#define TAILQ_SWAP(head1, head2, type, field) do { \
QUEUE_TYPEOF(type) *swap_first = (head1)->tqh_first; \
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -37,10 +37,16 @@
#include <sys/types.h>
#include <sys/timespec.h>
+#ifndef __FreeBSD__
+#include <sys/time.h>
+#endif
+
+#ifdef __FreeBSD__
struct timezone {
int tz_minuteswest; /* minutes west of Greenwich */
int tz_dsttime; /* type of dst correction */
};
+#endif
#define DST_NONE 0 /* not on dst */
#define DST_USA 1 /* USA style dst */
#define DST_AUST 2 /* Australian style dst */
@@ -49,7 +55,7 @@
#define DST_EET 5 /* Eastern European dst */
#define DST_CAN 6 /* Canada */
-#if __BSD_VISIBLE
+#if 1 /* used by sys/devicestat.h and others */
struct bintime {
time_t sec;
uint64_t frac;
@@ -282,7 +288,7 @@
#endif /* _KERNEL */
-#ifndef _KERNEL /* NetBSD/OpenBSD compatible interfaces */
+#if 0
#define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0)
#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
@@ -310,6 +316,7 @@
} while (0)
#endif
+#ifdef __FreeBSD__
/*
* Names of the interval timers, and structure
* defining a timer setting.
@@ -362,6 +369,8 @@
#define CPUCLOCK_WHICH_TID 1
#endif
+#endif
+
#ifdef _KERNEL
/*
@@ -473,6 +482,7 @@
#include <sys/cdefs.h>
#include <sys/select.h>
+#if 0
__BEGIN_DECLS
int setitimer(int, const struct itimerval *, struct itimerval *);
int utimes(const char *, const struct timeval *);
@@ -492,6 +502,7 @@
#endif
__END_DECLS
+#endif
#endif /* !_KERNEL */
--- a/sys/sys/timespec.h
+++ b/sys/sys/timespec.h
@@ -37,7 +37,9 @@
#include <sys/cdefs.h>
#include <sys/_timespec.h>
-#if __BSD_VISIBLE
+#ifndef __FreeBSD__
+#include <sys/time.h>
+#else
#define TIMEVAL_TO_TIMESPEC(tv, ts) \
do { \
(ts)->tv_sec = (tv)->tv_sec; \
@@ -51,6 +53,7 @@
#endif /* __BSD_VISIBLE */
+#ifdef __FreeBSD__
/*
* Structure defined by POSIX.1b to be like a itimerval, but with
* timespecs. Used in the timer_*() system calls.
@@ -59,5 +62,6 @@
struct timespec it_interval;
struct timespec it_value;
};
+#endif
#endif /* _SYS_TIMESPEC_H_ */
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -44,7 +44,21 @@
#include <machine/endian.h>
#include <sys/_types.h>
+#ifdef __FreeBSD__
#include <sys/_pthreadtypes.h>
+#endif
+
+#ifndef __FreeBSD__
+/* Allow conflicting declarations in glibc <sys/types.h> to override us. */
+#include <sys/types.h>
+#define _CLOCK_T_DECLARED
+#define _FSBLKCNT_T_DECLARED
+#define _ID_T_DECLARED
+#define _TIME_T_DECLARED
+#define _TIMER_T_DECLARED
+#define _MQD_T_DECLARED
+#define _INO_T_DECLARED
+#endif
#if __BSD_VISIBLE
typedef unsigned char u_char;
@@ -179,7 +193,9 @@
#define _PID_T_DECLARED
#endif
+#ifdef __FreeBSD__
typedef __register_t register_t;
+#endif
#ifndef _RLIM_T_DECLARED
typedef __rlim_t rlim_t; /* resource limit */
@@ -348,10 +364,11 @@
#define __bitcount(x) __bitcount32((unsigned int)(x))
#endif
-#if __BSD_VISIBLE
#include <sys/select.h>
+#ifdef __FreeBSD__
+
/*
* minor() gives a cookie instead of an index since we don't want to
* change the meanings of bits 0-15 or waste time and space shifting
@@ -366,7 +383,7 @@
* <stdio.h> to give broken programs a better chance of working with
* 64-bit off_t's.
*/
-#ifndef _KERNEL
+#if 0
__BEGIN_DECLS
#ifndef _FTRUNCATE_DECLARED
#define _FTRUNCATE_DECLARED
--- a/sys/sys/_sigset.h
+++ b/sys/sys/_sigset.h
@@ -48,9 +48,11 @@
#define _SIG_BIT(sig) (1 << (_SIG_IDX(sig) & 31))
#define _SIG_VALID(sig) ((sig) <= _SIG_MAXSIG && (sig) > 0)
+#ifdef __FreeBSD__
typedef struct __sigset {
__uint32_t __bits[_SIG_WORDS];
} __sigset_t;
+#endif
#if defined(_KERNEL) && defined(COMPAT_43)
typedef unsigned int osigset_t;
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -38,6 +38,8 @@
#include <sys/_iovec.h>
#include <machine/_align.h>
+#ifdef __FreeBSD__
+
/*
* Definitions related to sockets: types, address families, options.
*/
@@ -360,6 +362,10 @@
#define PF_MAX AF_MAX
+#endif /* __BSD_VISIBLE */
+#endif /* 0 */
+
+#if __BSD_VISIBLE
/*
* Definitions for network related sysctl, CTL_NET.
*
@@ -388,6 +394,8 @@
#endif /* __BSD_VISIBLE */
+#ifdef __FreeBSD__
+
/*
* Maximum queue length specifiable by listen.
*/
@@ -661,5 +669,6 @@
#endif
+#endif
#endif /* !_SYS_SOCKET_H_ */
--- a/sys/sys/_iovec.h
+++ b/sys/sys/_iovec.h
@@ -40,9 +40,13 @@
#define _SIZE_T_DECLARED
#endif
+#ifndef __FreeBSD__
+#include <sys/uio.h>
+#else
struct iovec {
void *iov_base; /* Base address. */
size_t iov_len; /* Length. */
};
+#endif
#endif /* !_SYS__IOVEC_H_ */
--- a/sys/x86/include/_types.h
+++ b/sys/x86/include/_types.h
@@ -81,7 +81,10 @@
typedef __int64_t __intfptr_t;
typedef __int64_t __intptr_t;
#else
+#ifdef __FreeBSD__
+/* This divergence is probably accidental, but it can't be fixed now. */
typedef unsigned long __clock_t;
+#endif
typedef __int32_t __critical_t;
typedef long double __double_t;
typedef long double __float_t;
@@ -99,11 +102,15 @@
typedef __int64_t __int_least64_t;
#ifdef __LP64__
typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
+#ifdef __FreeBSD__
typedef __int64_t __register_t;
+#endif
typedef __int64_t __segsz_t; /* segment size (in pages) */
typedef __uint64_t __size_t; /* sizeof() */
typedef __int64_t __ssize_t; /* byte count or error */
+# ifdef __FreeBSD__
typedef __int64_t __time_t; /* time()... */
+# endif
typedef __uint64_t __uintfptr_t;
typedef __uint64_t __uintptr_t;
#else
@@ -112,7 +119,9 @@
typedef __int32_t __segsz_t;
typedef __uint32_t __size_t;
typedef __int32_t __ssize_t;
+# ifdef __FreeBSD__
typedef __int32_t __time_t;
+# endif
typedef __uint32_t __uintfptr_t;
typedef __uint32_t __uintptr_t;
#endif
--- a/sys/x86/include/signal.h
+++ b/sys/x86/include/signal.h
@@ -46,9 +46,15 @@
#endif
#ifdef __i386__
+
+#ifndef __FreeBSD__
+#define __need_sig_atomic_t
+#include <signal.h>
+#else
typedef int sig_atomic_t;
+#endif
-#if __BSD_VISIBLE
+#ifdef __FreeBSD__
struct sigcontext {
struct __sigset sc_mask; /* signal mask to restore */
int sc_onstack; /* sigstack state to restore */
@@ -100,9 +106,15 @@
#endif /* __i386__ */
#ifdef __amd64__
+
+#ifndef __FreeBSD__
+#define __need_sig_atomic_t
+#include <signal.h>
+#else
typedef long sig_atomic_t;
+#endif
-#if __BSD_VISIBLE
+#ifdef __FreeBSD__
/*
* Information pushed on stack when a signal is delivered.
* This is used by the kernel to restore state following
--- a/sys/x86/include/endian.h
+++ b/sys/x86/include/endian.h
@@ -56,7 +56,9 @@
* Deprecated variants that don't have enough underscores to be useful in more
* strict namespaces.
*/
-#if __BSD_VISIBLE
+#ifndef __FreeBSD__
+#include <endian.h>
+#else
#define LITTLE_ENDIAN _LITTLE_ENDIAN
#define BIG_ENDIAN _BIG_ENDIAN
#define PDP_ENDIAN _PDP_ENDIAN
--- a/sys/x86/include/stdarg.h
+++ b/sys/x86/include/stdarg.h
@@ -34,6 +34,8 @@
#include <sys/cdefs.h>
#include <sys/_types.h>
+#ifdef __FreeBSD__
+
#ifndef _VA_LIST_DECLARED
#define _VA_LIST_DECLARED
typedef __va_list va_list;
@@ -74,4 +76,6 @@
#error this file needs to be ported to your compiler
#endif
+#endif
+
#endif /* !_MACHINE_STDARG_H_ */
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -33,15 +33,6 @@
#ifndef _SYS_SYSLIMITS_H_
#define _SYS_SYSLIMITS_H_
-#if !defined(_KERNEL) && !defined(_LIMITS_H_) && !defined(_SYS_PARAM_H_)
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-#ifdef __CC_SUPPORTS_WARNING
-#warning "No user-serviceable parts inside."
-#endif
-#endif
-
/*
* Do not add any new variables here. (See the comment at the end of
* the file for why.)
|