On Fri, Mar 18, 2011 at 5:19 PM, Garrett Cooper <gcoo...@freebsd.org> wrote: > On Fri, Mar 18, 2011 at 4:45 PM, Arnaud Lacombe <lacom...@gmail.com> wrote: >> Hi, >> >> On Fri, Mar 18, 2011 at 7:37 PM, FreeBSD Tinderbox >> <tinder...@freebsd.org> wrote: >>> [...] >>> awk -f /src/sys/tools/makeobjops.awk /src/sys/dev/eisa/eisa_if.m -c ; cc >>> -c -O2 -pipe -fno-strict-aliasing -std=c99 -Wall -Wredundant-decls >>> -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith >>> -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions >>> -nostdinc -I. -I/src/sys -I/src/sys/contrib/altq -D_KERNEL >>> -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common >>> -finline-limit=8000 --param inline-unit-growth=100 --param >>> large-function-growth=1000 -DGPROF -falign-functions=16 -DGPROF4 -DGUPROF >>> -fno-builtin -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx >>> -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float -ffreestanding >>> -fstack-protector -Werror -pg -mprofiler-epilogue eisa_if.c >>> cc -c -O2 -pipe -fno-strict-aliasing -std=c99 -Wall -Wredundant-decls >>> -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith >>> -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions >>> -nostdinc -I. -I/src/sys -I/src/sys/contrib/altq -D_KERNEL >>> -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common >>> -finline-limit=8000 --param inline-unit-growth=100 --param >>> large-function-growth=1000 -DGPROF -falign-functions=16 -DGPROF4 -DGUPROF >>> -fno-builtin -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx >>> -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float -ffreestanding >>> -fstack-protector -Werror -pg -mprofiler-epilogue >>> /src/sys/dev/e1000/if_em.c -I/src/sys/dev/e1000 >>> In file included from /src/sys/dev/e1000/if_em.c:86: >>> /src/sys/dev/e1000/if_em.h:216:1: error: "SYSCTL_ADD_UQUAD" redefined >>> In file included from /src/sys/dev/e1000/if_em.c:55: >>> /src/sys/sys/sysctl.h:370:1: error: this is the location of the previous >>> definition >>> *** Error code 1 >>> >> This should fix it: >> >> diff --git a/src/if_em.h b/src/if_em.h >> index 367d249..9381fc8 100644 >> --- a/src/if_em.h >> +++ b/src/if_em.h >> @@ -213,7 +213,7 @@ >> #define EM_MSIX_BAR 3 /* On 82575 */ >> >> /* More backward compatibility */ >> -#if !defined(SYSTCL_ADD_UQUAD) >> +#if !defined(SYSCTL_ADD_UQUAD) >> #define SYSCTL_ADD_UQUAD SYSCTL_ADD_QUAD >> #endif >> >> For the record, I privately sent jfv@ a patch about this build failure >> a month ago ... > > That won't work. It needs to be SYSCTL_ADD_U64 now.
Oh wait... mdf didn't change that. Sorry, please ignore the previous message. -Garrett _______________________________________________ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
