From 0cf88fd58afb63f3c0efc7ca00bb3a3b672bddca Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Tue, 27 Dec 2016 21:51:13 +0100 Subject: [PATCH] Revert "Add ." This reverts commit f6cde2d7a618f2b4dff62e4fd44e3c1bf6624b5e. gcc detected this header existing and emitted its own limits.h that included the libc limits.h. This caused the #include_next chain to reach the end and including the header failed. Undoing this commit for now until the compiler toolchain is updated to avoid this problem. --- kernel/include/sortix/limits.h | 2 +- libc/include/limits.h | 30 ------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 libc/include/limits.h diff --git a/kernel/include/sortix/limits.h b/kernel/include/sortix/limits.h index 556214e4..60f7e7db 100644 --- a/kernel/include/sortix/limits.h +++ b/kernel/include/sortix/limits.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2016 Jonas 'Sortie' Termansen. + * Copyright (c) 2014 Jonas 'Sortie' Termansen. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libc/include/limits.h b/libc/include/limits.h deleted file mode 100644 index 6936c6a6..00000000 --- a/libc/include/limits.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2014, 2016 Jonas 'Sortie' Termansen. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * limits.h - * Implementation constants. - */ - -#ifndef INCLUDE_LIMITS_H -#define INCLUDE_LIMITS_H - -#include - -/* The compiler provides a bulk of the declarations. */ -#include_next - -#include - -#endif