diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-07-17 13:46:22 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-07-17 13:46:22 +0000 |
| commit | c414b7d21ace1192572dfa014f4390b1dfcc64ab (patch) | |
| tree | 9dd33aebb67b73343ccf66e54b10bee290abfef2 | |
| parent | a91e16dae7a600bc97806c314e43a7b84d135fae (diff) | |
| download | drakx-c414b7d21ace1192572dfa014f4390b1dfcc64ab.tar drakx-c414b7d21ace1192572dfa014f4390b1dfcc64ab.tar.gz drakx-c414b7d21ace1192572dfa014f4390b1dfcc64ab.tar.bz2 drakx-c414b7d21ace1192572dfa014f4390b1dfcc64ab.tar.xz drakx-c414b7d21ace1192572dfa014f4390b1dfcc64ab.zip | |
iniline init-libc-headers.h in init.c
| -rw-r--r-- | mdk-stage1/init-libc-headers.h | 45 | ||||
| -rw-r--r-- | mdk-stage1/init.c | 25 |
2 files changed, 24 insertions, 46 deletions
diff --git a/mdk-stage1/init-libc-headers.h b/mdk-stage1/init-libc-headers.h deleted file mode 100644 index 55d6f10b3..000000000 --- a/mdk-stage1/init-libc-headers.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Guillaume Cottenceau (gc@mandrakesoft.com) - * - * Copyright 2000 Mandrakesoft - * - * This software may be freely redistributed under the terms of the GNU - * public license. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -/* - * Portions from Erik Troan (ewt@redhat.com) - * - * Copyright 1996 Red Hat Software - * - */ - -#include <stdlib.h> -#include <unistd.h> -#include <stdio.h> -#include <string.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <sys/mount.h> -#include <linux/un.h> -#include <errno.h> -#include <signal.h> -#include <sys/resource.h> -#include <sys/wait.h> -#include <linux/unistd.h> -#include <sys/select.h> -#include <sys/ioctl.h> - -#ifndef SOCK_STREAM -#define SOCK_STREAM 1 -#endif - -static inline _syscall3(int, syslog, int, type, char *, bufp, int, len); -static inline _syscall3(int, reboot, int, magic, int, magic2, int, flag); diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index 644879ac4..62bfb9cb1 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -20,7 +20,30 @@ */ #ifndef INIT_HEADERS -#include "init-libc-headers.h" +#include <stdlib.h> +#include <unistd.h> +#include <stdio.h> +#include <string.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <sys/mount.h> +#include <linux/un.h> +#include <errno.h> +#include <signal.h> +#include <sys/resource.h> +#include <sys/wait.h> +#include <linux/unistd.h> +#include <sys/select.h> +#include <sys/ioctl.h> + +#ifndef SOCK_STREAM +#define SOCK_STREAM 1 +#endif + +static inline _syscall3(int, syslog, int, type, char *, bufp, int, len); +static inline _syscall3(int, reboot, int, magic, int, magic2, int, flag); #else #include INIT_HEADERS #endif |