* libc: config.h in lost/config.h verschoben um Probleme beim cross compilieren zu vermeiden
Index: trunk/src/include/config.h =================================================================== --- trunk.orig/src/include/config.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2006 The LOST Project. All rights reserved. - * - * This code is derived from software contributed to the LOST Project - * by Andreas Klebinger. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the LOST Project - * and its contributors. - * 4. Neither the name of the LOST Project nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _CONFIG_H_ -#define _CONFIG_H_ - -#define MALLOC_LOST 1 -#define MALLOC_BSD 2 -#define MALLOC_LIBALLOC 3 - -#define ARCH_I386 1 -#define ARCH_AMD64 2 - -#define SYSCALL_V1 1 -#define SYSCALL_V2 2 - -//%desc "Architektur" -//%type "radio" -//%values "ARCH_I386,ARCH_AMD64" -#define CONFIG_ARCH ARCH_I386 - -//%desc "Kooperatives Multitasking" -//%type "yesno" -#undef CONFIG_COOPERATIVE_MULTITASKING - -//%desc "Timerfrequenz in Hertz" -//%type "text" -#define CONFIG_TIMER_HZ 50 - -//%desc "Letzten Syscall f�ugausgaben merken" -//%type "yesno" -#define CONFIG_DEBUG_LAST_SYSCALL i386 - -//%desc "malloc" -//%type "radio" -//%values "MALLOC_LOST,MALLOC_BSD,MALLOC_LIBALLOC" -#define CONFIG_MALLOC MALLOC_LIBALLOC - -//%desc "shell - Eingebaute Befehle" -//%type "yesno" -#define CONFIG_SHELL_BUILTIN_ONLY - -//%desc "Releaseversion (Einige Pruefungen weglassen)" -//%type "yesno" -#undef CONFIG_RELEASE_VERSION - -//%desc "Stubs in der LibC nicht benutzen" -//%type "yesno" -#undef CONFIG_LIBC_NO_STUBS - - -#endif // _CONFIG_H_ - Index: trunk/src/include/lost/config.h =================================================================== --- /dev/null +++ trunk/src/include/lost/config.h @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2006 The LOST Project. All rights reserved. + * + * This code is derived from software contributed to the LOST Project + * by Andreas Klebinger. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the LOST Project + * and its contributors. + * 4. Neither the name of the LOST Project nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _CONFIG_H_ +#define _CONFIG_H_ + +#define MALLOC_LOST 1 +#define MALLOC_BSD 2 +#define MALLOC_LIBALLOC 3 + +#define ARCH_I386 1 +#define ARCH_AMD64 2 + +#define SYSCALL_V1 1 +#define SYSCALL_V2 2 + +//%desc "Architektur" +//%type "radio" +//%values "ARCH_I386,ARCH_AMD64" +#define CONFIG_ARCH ARCH_I386 + +//%desc "Kooperatives Multitasking" +//%type "yesno" +#undef CONFIG_COOPERATIVE_MULTITASKING + +//%desc "Timerfrequenz in Hertz" +//%type "text" +#define CONFIG_TIMER_HZ 50 + +//%desc "Letzten Syscall f�ugausgaben merken" +//%type "yesno" +#define CONFIG_DEBUG_LAST_SYSCALL i386 + +//%desc "malloc" +//%type "radio" +//%values "MALLOC_LOST,MALLOC_BSD,MALLOC_LIBALLOC" +#define CONFIG_MALLOC MALLOC_LIBALLOC + +//%desc "shell - Eingebaute Befehle" +//%type "yesno" +#define CONFIG_SHELL_BUILTIN_ONLY + +//%desc "Releaseversion (Einige Pruefungen weglassen)" +//%type "yesno" +#undef CONFIG_RELEASE_VERSION + +//%desc "Stubs in der LibC nicht benutzen" +//%type "yesno" +#define CONFIG_LIBC_NO_STUBS + + +#endif // _CONFIG_H_ + Index: trunk/src/include/stdlib.h =================================================================== --- trunk.orig/src/include/stdlib.h +++ trunk/src/include/stdlib.h @@ -38,7 +38,7 @@ #include <stddef.h> #include "string.h" -#include <config.h> +#include <lost/config.h> #define EXIT_SUCCESS 0 #define EXIT_FAILURE 1 Index: trunk/src/kernel/include/syscall.h =================================================================== --- trunk.orig/src/kernel/include/syscall.h +++ trunk/src/kernel/include/syscall.h @@ -4,7 +4,7 @@ #include "types.h" #include "intr.h" #include "syscallno.h" -#include "config.h" +#include <lost/config.h> #ifdef CONFIG_DEBUG_LAST_SYSCALL #define DEBUG_LAST_SYSCALL_DATA_SIZE 4 Index: trunk/src/kernel/src/init.c =================================================================== --- trunk.orig/src/kernel/src/init.c +++ trunk/src/kernel/src/init.c @@ -50,7 +50,7 @@ #include "paging.h" #include "modules.h" #include "stdlib.h" -#include "config.h" +#include <lost/config.h> #include "syscall.h" #include "debug.h" #include "io.h" Index: trunk/src/kernel/src/intr.c =================================================================== --- trunk.orig/src/kernel/src/intr.c +++ trunk/src/kernel/src/intr.c @@ -49,7 +49,7 @@ #include "syscall.h" #include "tasks.h" #include "vmm.h" -#include "config.h" +#include <lost/config.h> #include "debug.h" #include "rpc.h" #include "vm86.h" Index: trunk/src/kernel/src/schedule.c =================================================================== --- trunk.orig/src/kernel/src/schedule.c +++ trunk/src/kernel/src/schedule.c @@ -33,7 +33,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include <lost/config.h> #include "types.h" #include "string.h" #include "stdlib.h" Index: trunk/src/kernel/src/syscall.c =================================================================== --- trunk.orig/src/kernel/src/syscall.c +++ trunk/src/kernel/src/syscall.c @@ -47,7 +47,7 @@ #include "tasks.h" #include "stdlib.h" #include "intr.h" -#include "config.h" +#include <lost/config.h> #include "rpc.h" #include "io.h" #include "debug.h" Index: trunk/src/kernel2/src/arch/amd64/debug.c =================================================================== --- trunk.orig/src/kernel2/src/arch/amd64/debug.c +++ trunk/src/kernel2/src/arch/amd64/debug.c @@ -37,7 +37,7 @@ #include <stdint.h> #include <string.h> -#include "config.h" +#include <lost/config.h> #include "kprintf.h" #include "multiboot.h" #include "debug.h" Index: trunk/src/kernel2/src/arch/i386/debug.c =================================================================== --- trunk.orig/src/kernel2/src/arch/i386/debug.c +++ trunk/src/kernel2/src/arch/i386/debug.c @@ -37,7 +37,7 @@ #include <stdint.h> #include <string.h> -#include "config.h" +#include <lost/config.h> #include "kprintf.h" #include "multiboot.h" #include "debug.h" Index: trunk/src/kernel2/src/arch/i386/syscall.c =================================================================== --- trunk.orig/src/kernel2/src/arch/i386/syscall.c +++ trunk/src/kernel2/src/arch/i386/syscall.c @@ -1,5 +1,5 @@ #include <types.h> -#include <config.h> +#include <lost/config.h> #include "cpu.h" #include "syscall.h" Index: trunk/src/kernel2/src/debug.c =================================================================== --- trunk.orig/src/kernel2/src/debug.c +++ trunk/src/kernel2/src/debug.c @@ -37,7 +37,7 @@ #include <stdint.h> #include <string.h> -#include "config.h" +#include <lost/config.h> #include "kprintf.h" #include "multiboot.h" #include "debug.h" Index: trunk/src/kernel2/src/init.c =================================================================== --- trunk.orig/src/kernel2/src/init.c +++ trunk/src/kernel2/src/init.c @@ -35,7 +35,7 @@ #include <string.h> #include <stdlib.h> -#include <config.h> +#include <lost/config.h> #include "multiboot.h" #include "mm.h" Index: trunk/src/kernel2/src/interrupts/im.c =================================================================== --- trunk.orig/src/kernel2/src/interrupts/im.c +++ trunk/src/kernel2/src/interrupts/im.c @@ -34,7 +34,7 @@ */ #include <types.h> -#include <config.h> +#include <lost/config.h> #include "cpu.h" #include "im.h" Index: trunk/src/kernel2/src/kprintf.c =================================================================== --- trunk.orig/src/kernel2/src/kprintf.c +++ trunk/src/kernel2/src/kprintf.c @@ -34,7 +34,7 @@ */ #include <stdint.h> -#include <config.h> +#include <lost/config.h> #include "kprintf.h" #include "console.h" Index: trunk/src/kernel2/src/smp/smp.c =================================================================== --- trunk.orig/src/kernel2/src/smp/smp.c +++ trunk/src/kernel2/src/smp/smp.c @@ -35,7 +35,7 @@ #include <types.h> #include <string.h> #include <stdint.h> -#include <config.h> +#include <lost/config.h> #include "lock.h" #include "cpu.h" Index: trunk/src/kernel2/src/tasks/modules.c =================================================================== --- trunk.orig/src/kernel2/src/tasks/modules.c +++ trunk/src/kernel2/src/tasks/modules.c @@ -34,7 +34,7 @@ */ #include <types.h> -#include <config.h> +#include <lost/config.h> #include <stdlib.h> #include <loader.h> #include <syscall_structs.h> Index: trunk/src/kernel2/src/tasks/pm.c =================================================================== --- trunk.orig/src/kernel2/src/tasks/pm.c +++ trunk/src/kernel2/src/tasks/pm.c @@ -34,7 +34,7 @@ */ #include <types.h> -#include <config.h> +#include <lost/config.h> #include <stdlib.h> #include <collections.h> Index: trunk/src/kernel2/src/tasks/scheduler.c =================================================================== --- trunk.orig/src/kernel2/src/tasks/scheduler.c +++ trunk/src/kernel2/src/tasks/scheduler.c @@ -34,7 +34,7 @@ */ #include <types.h> -#include <config.h> +#include <lost/config.h> #include <stdlib.h> #include <collections.h> Index: trunk/src/kernel2/src/tasks/thread.c =================================================================== --- trunk.orig/src/kernel2/src/tasks/thread.c +++ trunk/src/kernel2/src/tasks/thread.c @@ -34,7 +34,7 @@ */ #include <types.h> -#include <config.h> +#include <lost/config.h> #include <stdlib.h> #include <collections.h> Index: trunk/src/lib/stdlibc/bsdmalloc.c =================================================================== --- trunk.orig/src/lib/stdlibc/bsdmalloc.c +++ trunk/src/lib/stdlibc/bsdmalloc.c @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- */ -#include "config.h" +#include <lost/config.h> #if CONFIG_MALLOC == MALLOC_BSD /* Index: trunk/src/lib/stdlibc/liballoc.c =================================================================== --- trunk.orig/src/lib/stdlibc/liballoc.c +++ trunk/src/lib/stdlibc/liballoc.c @@ -1,4 +1,4 @@ -#include <config.h> +#include <lost/config.h> #if CONFIG_MALLOC == MALLOC_LIBALLOC //#include <liballoc.h> Index: trunk/src/lib/stdlibc/malloc.c =================================================================== --- trunk.orig/src/lib/stdlibc/malloc.c +++ trunk/src/lib/stdlibc/malloc.c @@ -33,7 +33,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <config.h> +#include <lost/config.h> #if CONFIG_MALLOC == MALLOC_LOST #include <types.h> #include <string.h> Index: trunk/src/lib/string.c =================================================================== --- trunk.orig/src/lib/string.c +++ trunk/src/lib/string.c @@ -32,7 +32,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <config.h> +#include <lost/config.h> #include <string.h> #include <stdlib.h> Index: trunk/src/modules/c/mousetest/mousetest.c =================================================================== --- trunk.orig/src/modules/c/mousetest/mousetest.c +++ trunk/src/modules/c/mousetest/mousetest.c @@ -45,7 +45,7 @@ #include "io.h" #include "dir.h" #include "lostio.h" -#include "config.h" +#include <lost/config.h> int main(int argc, char* argv[]) { Index: trunk/src/modules/c/shell/Makefile.all =================================================================== --- trunk.orig/src/modules/c/shell/Makefile.all +++ trunk/src/modules/c/shell/Makefile.all @@ -3,7 +3,7 @@ source $LOST_BUILDMK_ROOT/config.sh echo "LD $1/apps/sh" -if [ -z "`grep '#define CONFIG_SHELL_BUILTIN_ONLY' ../../../include/config.h`" ]; +if [ -z "`grep '#define CONFIG_SHELL_BUILTIN_ONLY' ../../../include/lost/config.h`" ]; then $LOST_TOOLS_LD -osh -Ttext=0x40000000 *.o --start-group $2 --end-group else Index: trunk/src/modules/c/shell/cmds/Makefile.all =================================================================== --- trunk.orig/src/modules/c/shell/cmds/Makefile.all +++ trunk/src/modules/c/shell/cmds/Makefile.all @@ -1,7 +1,7 @@ shopt -s extglob source $LOST_BUILDMK_ROOT/config.sh -if [ -z "`grep '#define CONFIG_SHELL_BUILTIN_ONLY' ../../../../include/config.h`" ]; +if [ -z "`grep '#define CONFIG_SHELL_BUILTIN_ONLY' ../../../../include/lost/config.h`" ]; then echo "LD $1/apps/bincat" $LOST_TOOLS_LD -obincat -Ttext=0x40000000 bincat.o --start-group $2 --end-group Index: trunk/src/modules/c/shell/cmds/bench.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/bench.c +++ trunk/src/modules/c/shell/cmds/bench.c @@ -34,7 +34,7 @@ */ #include <syscall.h> -#include <config.h> +#include <lost/config.h> #include <stdlib.h> #include <stdio.h> Index: trunk/src/modules/c/shell/cmds/bincat.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/bincat.c +++ trunk/src/modules/c/shell/cmds/bincat.c @@ -37,7 +37,7 @@ #include "stdlib.h" #include "stdio.h" #include "unistd.h" -#include "config.h" +#include <lost/config.h> #define BLOCK_SIZE 1024 Index: trunk/src/modules/c/shell/cmds/cat.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/cat.c +++ trunk/src/modules/c/shell/cmds/cat.c @@ -37,7 +37,7 @@ #include "stdlib.h" #include "stdio.h" #include "unistd.h" -#include "config.h" +#include <lost/config.h> #define BLOCK_SIZE 1024 Index: trunk/src/modules/c/shell/cmds/cp.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/cp.c +++ trunk/src/modules/c/shell/cmds/cp.c @@ -41,7 +41,7 @@ #include "stdlib.h" #include "stdio.h" #include "unistd.h" -#include "config.h" +#include <lost/config.h> #define BUFFER_SIZE 4096 Index: trunk/src/modules/c/shell/cmds/date.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/date.c +++ trunk/src/modules/c/shell/cmds/date.c @@ -36,7 +36,7 @@ #include "types.h" #include "stdlib.h" #include "stdio.h" -#include "config.h" +#include <lost/config.h> void date_display_usage(); Index: trunk/src/modules/c/shell/cmds/dbg_st.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/dbg_st.c +++ trunk/src/modules/c/shell/cmds/dbg_st.c @@ -38,7 +38,7 @@ #include <stdio.h> #include <unistd.h> #include <io.h> -#include <config.h> +#include <lost/config.h> #include <syscall.h> void dbg_st_display_usage(); Index: trunk/src/modules/c/shell/cmds/echo.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/echo.c +++ trunk/src/modules/c/shell/cmds/echo.c @@ -36,7 +36,7 @@ #include "types.h" #include "stdio.h" #include "stdlib.h" -#include "config.h" +#include <lost/config.h> #ifdef CONFIG_SHELL_BUILTIN_ONLY int shell_command_echo(int argc, char* argv[], const char* args) Index: trunk/src/modules/c/shell/cmds/free.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/free.c +++ trunk/src/modules/c/shell/cmds/free.c @@ -36,7 +36,7 @@ #include "types.h" #include "syscall.h" #include "stdio.h" -#include "config.h" +#include <lost/config.h> #ifdef CONFIG_SHELL_BUILTIN_ONLY int shell_command_free(int argc, char* argv[], const char* args) Index: trunk/src/modules/c/shell/cmds/irc.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/irc.c +++ trunk/src/modules/c/shell/cmds/irc.c @@ -37,7 +37,7 @@ #include "stdlib.h" #include "stdio.h" #include "unistd.h" -#include "config.h" +#include <lost/config.h> #include "sleep.h" void irc_display_usage(); Index: trunk/src/modules/c/shell/cmds/ln.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/ln.c +++ trunk/src/modules/c/shell/cmds/ln.c @@ -38,7 +38,7 @@ #include "stdio.h" #include "unistd.h" #include "dir.h" -#include "config.h" +#include <lost/config.h> void ln_display_usage(); Index: trunk/src/modules/c/shell/cmds/ls.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/ls.c +++ trunk/src/modules/c/shell/cmds/ls.c @@ -38,7 +38,7 @@ #include "stdio.h" #include "dir.h" #include "unistd.h" -#include "config.h" +#include <lost/config.h> void ls_display_usage(); Index: trunk/src/modules/c/shell/cmds/mkdir.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/mkdir.c +++ trunk/src/modules/c/shell/cmds/mkdir.c @@ -38,7 +38,7 @@ #include "stdio.h" #include "unistd.h" #include "dir.h" -#include "config.h" +#include <lost/config.h> void mkdir_display_usage(); Index: trunk/src/modules/c/shell/cmds/pipe.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/pipe.c +++ trunk/src/modules/c/shell/cmds/pipe.c @@ -37,7 +37,7 @@ #include "stdlib.h" #include "stdio.h" #include "unistd.h" -#include "config.h" +#include <lost/config.h> void pipe_display_usage(); Index: trunk/src/modules/c/shell/cmds/ps.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/ps.c +++ trunk/src/modules/c/shell/cmds/ps.c @@ -38,7 +38,7 @@ #include "stdio.h" #include "syscall.h" #include "unistd.h" -#include "config.h" +#include <lost/config.h> void ps_display_usage(); Index: trunk/src/modules/c/shell/cmds/pstree.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/pstree.c +++ trunk/src/modules/c/shell/cmds/pstree.c @@ -37,7 +37,7 @@ #include "stdio.h" #include "syscall.h" #include "unistd.h" -#include "config.h" +#include <lost/config.h> void pstree_display_usage(); void pstree_show_children(pid_t pid, byte depth); Index: trunk/src/modules/c/shell/cmds/pwd.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/pwd.c +++ trunk/src/modules/c/shell/cmds/pwd.c @@ -37,7 +37,7 @@ #include "stdlib.h" #include "stdio.h" #include "unistd.h" -#include "config.h" +#include <lost/config.h> void pwd_display_usage(); Index: trunk/src/modules/c/shell/cmds/readlink.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/readlink.c +++ trunk/src/modules/c/shell/cmds/readlink.c @@ -38,7 +38,7 @@ #include "stdio.h" #include "unistd.h" #include "io.h" -#include "config.h" +#include <lost/config.h> void readlink_display_usage(); Index: trunk/src/modules/c/shell/cmds/rm.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/rm.c +++ trunk/src/modules/c/shell/cmds/rm.c @@ -38,7 +38,7 @@ #include "stdio.h" #include "unistd.h" #include "dir.h" -#include "config.h" +#include <lost/config.h> void rm_display_usage(); Index: trunk/src/modules/c/shell/cmds/set.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/set.c +++ trunk/src/modules/c/shell/cmds/set.c @@ -40,7 +40,7 @@ #include "stdio.h" #include "dir.h" #include "unistd.h" -#include "config.h" +#include <lost/config.h> void set_display_usage(); void set_list_vars(); Index: trunk/src/modules/c/shell/cmds/sleep.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/sleep.c +++ trunk/src/modules/c/shell/cmds/sleep.c @@ -36,7 +36,7 @@ #include <types.h> #include <stdlib.h> #include <stdio.h> -#include <config.h> +#include <lost/config.h> #include <unistd.h> void sleep_display_usage(); Index: trunk/src/modules/c/shell/cmds/stat.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/stat.c +++ trunk/src/modules/c/shell/cmds/stat.c @@ -36,7 +36,7 @@ #include <types.h> #include <stdlib.h> #include <stdio.h> -#include <config.h> +#include <lost/config.h> #include <sys/stat.h> #include <fcntl.h> Index: trunk/src/modules/c/shell/cmds/symlink.c =================================================================== --- trunk.orig/src/modules/c/shell/cmds/symlink.c +++ trunk/src/modules/c/shell/cmds/symlink.c @@ -38,7 +38,7 @@ #include "stdio.h" #include "unistd.h" #include "io.h" -#include "config.h" +#include <lost/config.h> void symlink_display_usage(); Index: trunk/src/modules/c/shell/shell.c =================================================================== --- trunk.orig/src/modules/c/shell/shell.c +++ trunk/src/modules/c/shell/shell.c @@ -43,7 +43,7 @@ #include "io.h" #include "dir.h" #include "lostio.h" -#include "config.h" +#include <lost/config.h> #include <sleep.h> #include <env.h> Index: trunk/src/modules/c/shell/shell.h =================================================================== --- trunk.orig/src/modules/c/shell/shell.h +++ trunk/src/modules/c/shell/shell.h @@ -59,7 +59,7 @@ int shell_command_set(int argc, char* ar int shell_command_source(int argc, char* argv[], const char* args); -#include "config.h" +#include <lost/config.h> #ifdef CONFIG_SHELL_BUILTIN_ONLY int shell_command_bincat(int argc, char* argv[], const char* args); int shell_command_cat(int argc, char* argv[], const char* args); Index: trunk/src/modules/include/math.h =================================================================== --- trunk.orig/src/modules/include/math.h +++ trunk/src/modules/include/math.h @@ -35,7 +35,7 @@ #ifndef _MATH_H_ #define _MATH_H_ -#include <config.h> +#include <lost/config.h> // Betrag einer reelen Zahl errechen #ifndef CONFIG_LIBC_NO_STUBS Index: trunk/src/modules/include/stdio.h =================================================================== --- trunk.orig/src/modules/include/stdio.h +++ trunk/src/modules/include/stdio.h @@ -38,7 +38,7 @@ #include <string.h> #include <stdarg.h> -#include <config.h> +#include <lost/config.h> #include <io_struct.h> Index: trunk/src/modules/include/time.h =================================================================== --- trunk.orig/src/modules/include/time.h +++ trunk/src/modules/include/time.h @@ -36,7 +36,7 @@ #ifndef _TIME_H_ #define _TIME_H_ #include <sys/types.h> -#include <config.h> +#include <lost/config.h> #define CLOCKS_PER_SEC 1000000 Index: trunk/src/modules/include/unistd.h =================================================================== --- trunk.orig/src/modules/include/unistd.h +++ trunk/src/modules/include/unistd.h @@ -36,7 +36,7 @@ #ifndef _UNISTD_H_ #define _UNISTD_H_ #include <sys/types.h> -#include <config.h> +#include <lost/config.h> /// Nummer der des Posix-Deskriptors fuer stdin #define STDIN_FILENO 0 Index: trunk/src/modules/lib/posix/exec.c =================================================================== --- trunk.orig/src/modules/lib/posix/exec.c +++ trunk/src/modules/lib/posix/exec.c @@ -39,7 +39,7 @@ #include <stdlib.h> #include "init.h" #include "syscall.h" -#include <config.h> +#include <lost/config.h> #ifndef CONFIG_LIBC_NO_STUBS /** Index: trunk/src/modules/lib/posix/misc.c =================================================================== --- trunk.orig/src/modules/lib/posix/misc.c +++ trunk/src/modules/lib/posix/misc.c @@ -34,7 +34,7 @@ */ #include <unistd.h> -#include <config.h> +#include <lost/config.h> #include <errno.h> #ifndef CONFIG_LIBC_NO_STUBS Index: trunk/src/modules/lib/posix/posix_files.c =================================================================== --- trunk.orig/src/modules/lib/posix/posix_files.c +++ trunk/src/modules/lib/posix/posix_files.c @@ -39,7 +39,7 @@ #include <fcntl.h> #include <collections.h> #include <errno.h> -#include <config.h> +#include <lost/config.h> /// Ein Element das einen Unix-Dateideskriptor mit einem Normalen verknuepft struct fd_list_element { Index: trunk/src/modules/lib/stdlibc/fscanf.c =================================================================== --- trunk.orig/src/modules/lib/stdlibc/fscanf.c +++ trunk/src/modules/lib/stdlibc/fscanf.c @@ -34,7 +34,7 @@ */ #include <stdio.h> -#include <config.h> +#include <lost/config.h> #ifndef CONFIG_LIBC_NO_STUBS int fscanf(FILE* fp, const char* format, ...) Index: trunk/src/modules/lib/stdlibc/math.c =================================================================== --- trunk.orig/src/modules/lib/stdlibc/math.c +++ trunk/src/modules/lib/stdlibc/math.c @@ -35,7 +35,7 @@ #include <stdio.h> #include <math.h> -#include <config.h> +#include <lost/config.h> // FIXME: Nur bis der Float-Kram vom Kernel unterstuetzt wird #ifndef CONFIG_LIBC_NO_STUBS Index: trunk/src/modules/lib/stdlibc/popen.c =================================================================== --- trunk.orig/src/modules/lib/stdlibc/popen.c +++ trunk/src/modules/lib/stdlibc/popen.c @@ -35,7 +35,7 @@ #include <time.h> #include <stdio.h> -#include <config.h> +#include <lost/config.h> #ifndef CONFIG_LIBC_NO_STUBS Index: trunk/src/modules/lib/stdlibc/rand.c =================================================================== --- trunk.orig/src/modules/lib/stdlibc/rand.c +++ trunk/src/modules/lib/stdlibc/rand.c @@ -35,7 +35,7 @@ #include <stdio.h> #include <math.h> -#include <config.h> +#include <lost/config.h> #include <syscall.h> static int rnd_seed = 0; Index: trunk/src/modules/lib/stdlibc/sscanf.c =================================================================== --- trunk.orig/src/modules/lib/stdlibc/sscanf.c +++ trunk/src/modules/lib/stdlibc/sscanf.c @@ -34,7 +34,7 @@ */ #include <stdio.h> -#include <config.h> +#include <lost/config.h> #ifndef CONFIG_LIBC_NO_STUBS int sscanf(const char* str, const char* format, ...) Index: trunk/src/modules/lib/stdlibc/time.c =================================================================== --- trunk.orig/src/modules/lib/stdlibc/time.c +++ trunk/src/modules/lib/stdlibc/time.c @@ -35,7 +35,7 @@ #include <time.h> #include <stdio.h> -#include <config.h> +#include <lost/config.h> #ifndef CONFIG_LIBC_NO_STUBS static struct tm tm = {
Attachment:
signature.asc
Description: This is a digitally signed message part.