Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)
- Fix for possible unset uid/gid in toproto
- Fix for default mtree style
- Update libelf
- Importing libexecinfo
- Resynchronize GCC, mpc, gmp, mpfr
- build.sh: Replace params with show-params.
This has been done as the make target has been renamed in the same
way, while a new target named params has been added. This new
target generates a file containing all the parameters, instead of
printing it on the console.
- Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
get getservbyport() out of the inner loop
Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091
This commit is contained in:
@@ -35,19 +35,19 @@
|
||||
__KERNEL_RCSID(0, "$NetBSD: edid.c,v 1.12 2013/02/08 16:35:10 skrll Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#ifdef __minix
|
||||
#if defined(__minix)
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#ifndef aprint_debug
|
||||
#define aprint_debug if (0) printf
|
||||
#endif /* !aprint_debug */
|
||||
#else /* !__minix */
|
||||
#else
|
||||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
#endif /* !__minix */
|
||||
#endif /* !defined(__minix) */
|
||||
#include <dev/videomode/videomode.h>
|
||||
#include <dev/videomode/ediddevs.h>
|
||||
#include <dev/videomode/edidreg.h>
|
||||
|
||||
@@ -33,11 +33,11 @@ __KERNEL_RCSID(0, "$NetBSD: pickmode.c,v 1.4 2011/04/09 20:53:39 christos Exp $"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <dev/videomode/videomode.h>
|
||||
#ifndef __minix
|
||||
#if !defined(__minix)
|
||||
#include "opt_videomode.h"
|
||||
#else
|
||||
#include <minix/sysutil.h>
|
||||
#endif
|
||||
#endif /* !defined(__minix) */
|
||||
#ifndef abs
|
||||
#define abs(x) (((x) < 0) ? -(x) : (x))
|
||||
#endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vesagtf.c,v 1.1 2006/05/11 01:49:53 gdamore Exp $ */
|
||||
/* $NetBSD: vesagtf.c,v 1.2 2013/09/15 15:56:07 martin Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006 Itronix Inc.
|
||||
@@ -153,7 +153,7 @@
|
||||
#ifdef _KERNEL
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: vesagtf.c,v 1.1 2006/05/11 01:49:53 gdamore Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: vesagtf.c,v 1.2 2013/09/15 15:56:07 martin Exp $");
|
||||
#include <sys/types.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@@ -226,12 +226,12 @@ vesagtf_mode_params(unsigned h_pixels, unsigned v_lines, unsigned freq,
|
||||
unsigned interlace;
|
||||
uint64_t h_period_est;
|
||||
unsigned vsync_plus_bp;
|
||||
unsigned v_back_porch;
|
||||
unsigned v_back_porch __unused;
|
||||
unsigned total_v_lines;
|
||||
uint64_t v_field_est;
|
||||
uint64_t h_period;
|
||||
unsigned v_field_rate;
|
||||
unsigned v_frame_rate;
|
||||
unsigned v_frame_rate __unused;
|
||||
unsigned left_margin;
|
||||
unsigned right_margin;
|
||||
unsigned total_active_pixels;
|
||||
@@ -660,7 +660,7 @@ vesagtf_mode(unsigned x, unsigned y, unsigned refresh, struct videomode *vmp)
|
||||
|
||||
/* print_xf86_mode() - print the XFree86 modeline, given mode timings. */
|
||||
|
||||
#ifndef __minix
|
||||
#if !defined(__minix)
|
||||
#ifndef _KERNEL
|
||||
void
|
||||
print_xf86_mode (struct videomode *vmp)
|
||||
@@ -701,4 +701,4 @@ main (int argc, char *argv[])
|
||||
|
||||
}
|
||||
#endif
|
||||
#endif /* !__minix */
|
||||
#endif /* !defined(__minix) */
|
||||
|
||||
Reference in New Issue
Block a user