diff options
Diffstat (limited to 'mach')
| -rw-r--r-- | mach/Machrules | 5 | ||||
| -rw-r--r-- | mach/errsystems.awk | 2 | ||||
| -rw-r--r-- | mach/mach/mig_support.h | 4 | ||||
| -rw-r--r-- | mach/mach_error.h | 26 | ||||
| -rw-r--r-- | mach/mach_init.c | 3 |
5 files changed, 26 insertions, 14 deletions
diff --git a/mach/Machrules b/mach/Machrules index adf5394..0971178 100644 --- a/mach/Machrules +++ b/mach/Machrules @@ -1,6 +1,6 @@ # Rules for MiG interfaces that want to go into the C library. -# Copyright (C) 1991,92,93,94,95,96,98,99 Free Software Foundation, Inc. +# Copyright (C) 1991,92,93,94,95,96,98,99,2001 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -55,6 +55,9 @@ $(objpfx)dummy.mk: MIGFLAGS = -DMACH_IPC_COMPAT=0 -DSTANDALONE -DTypeCheck=0 \ $(+includes) $(migdefines) -subrprefix __ +# Putting CC in the enivronment makes the mig wrapper script +# use the same compiler setup we are using to run cpp. +MIG := CC='${CC}' $(MIG) .SUFFIXES: .defs # Just to set specified_rule_matched. diff --git a/mach/errsystems.awk b/mach/errsystems.awk index c5cc530..b01c1bd 100644 --- a/mach/errsystems.awk +++ b/mach/errsystems.awk @@ -16,6 +16,6 @@ const struct error_system __mach_error_systems[err_max_system + 1] ="; } END { print " };"; - printf "\n\ + print "\n\ const int __mach_error_system_count = errlib_count (__mach_error_systems);"; } diff --git a/mach/mach/mig_support.h b/mach/mach/mig_support.h index bd01fd3..cf296dc 100644 --- a/mach/mach/mig_support.h +++ b/mach/mach/mig_support.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1994, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1993,94,97,99,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -65,6 +65,8 @@ extern void mig_reply_setup (const mach_msg_header_t *__request, mach_msg_header_t *__reply); /* Idiocy support function. */ +extern vm_size_t mig_strncpy (char *__dst, const char *__src, vm_size_t __len); +extern vm_size_t __mig_strncpy (char *__dst, const char *__src, vm_size_t); extern __inline vm_size_t __mig_strncpy (char *__dst, const char *__src, vm_size_t __len) { diff --git a/mach/mach_error.h b/mach/mach_error.h index f88d173..78f7c52 100644 --- a/mach/mach_error.h +++ b/mach/mach_error.h @@ -1,31 +1,37 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ /* * HISTORY * $Log$ + * Revision 1.4 2001/04/01 05:03:14 roland + * 2001-03-11 Roland McGrath <roland@frob.com> + * + * * mach/mach_error.h: Fix ancient #endif syntax. + * * hurd/hurdmalloc.c: Likewise. + * * Revision 1.3 1997/03/16 17:42:25 drepper * (mach_error_string, mach_error, mach_error_type): Always provide * prototypes. @@ -53,10 +59,10 @@ * * Revision 2.2 92/01/16 00:08:10 rpd * Moved from user collection to mk collection. - * + * * Revision 2.2 91/03/27 15:39:13 mrt * First checkin - * + * */ /* * File: mach_error.h @@ -93,4 +99,4 @@ const char *mach_error_type( mach_error_t error_value ); -#endif _MACH_ERROR_ +#endif /* _MACH_ERROR_ */ diff --git a/mach/mach_init.c b/mach/mach_init.c index eb8ed9b..30f3c84 100644 --- a/mach/mach_init.c +++ b/mach/mach_init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1993, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992,93,95,97,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -19,6 +19,7 @@ #include <mach_init.h> #include <mach/mach_interface.h> #include <mach/mig_support.h> +#include <unistd.h> mach_port_t __mach_task_self_; vm_size_t __vm_page_size = 0; /* Must be data not bss for weak alias. */ |