become more standard with libpayload headers. PATH_MAX belongs in limits.h,

tiny curses can use standard includes now.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Patrick Georgi <patrick@georgi-clan.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5664 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

5 files changed, 64 insertions, 31 deletions

diff --git a/payloads/libpayload/curses/local.h b/payloads/libpayload/curses/local.h
index b801e38e5b..b7c459d2a0 100644
--- a/payloads/libpayload/curses/local.h
+++ b/payloads/libpayload/curses/local.h
@@ -46,6 +46,8 @@
 #define NCURSES_NO_PADDING 0
 #define USE_HARD_TABS 0
 #define HAVE_FCNTL_H 0
+#define HAVE_LIMITS_H 1
+#define HAVE_UNISTD_H 1
 #define USE_XMC_SUPPORT 0
 #define NCURSES_EXPANDED 0
 #define HAVE_GETCWD 0
diff --git a/payloads/libpayload/include/curses.priv.h b/payloads/libpayload/include/curses.priv.h
index 1f51f2ed55..594b4da125 100644
--- a/payloads/libpayload/include/curses.priv.h
+++ b/payloads/libpayload/include/curses.priv.h
@@ -46,9 +46,6 @@
 #ifndef _CURSES_PRIV_H
 #define _CURSES_PRIV_H 1
 
-//// XXX
-extern void *memset(void *s, int c, size_t len);
-
 //// #include <ncurses_dll.h>
 
 #ifdef __cplusplus
@@ -63,38 +60,28 @@ extern "C" {
 #define MODULE_ID(id) /*nothing*/
 #endif
 
-//// #include <stdlib.h>
-//// #include <string.h>
-//// #include <sys/types.h>
-////
-//// #if HAVE_UNISTD_H
-//// #include <unistd.h>
-//// #endif
-////
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 //// #if HAVE_SYS_BSDTYPES_H
 //// #include <sys/bsdtypes.h>	/* needed for ISC */
 //// #endif
-////
-//// #if HAVE_LIMITS_H
-//// # include <limits.h>
+
+#if HAVE_LIMITS_H
+# include <limits.h>
 //// #elif HAVE_SYS_PARAM_H
 //// # include <sys/param.h>
-//// #endif
+#endif
 ////
 //// #include <assert.h>
-//// #include <stdio.h>
-////
-//// #include <errno.h>
+#include <stdio.h>
 
-#ifndef PATH_MAX
-# if defined(_POSIX_PATH_MAX)
-#  define PATH_MAX _POSIX_PATH_MAX
-# elif defined(MAXPATHLEN)
-#  define PATH_MAX MAXPATHLEN
-# else
-#  define PATH_MAX 255	/* the Posix minimum path-size */
-# endif
-#endif
+#include <errno.h>
 
 #if DECL_ERRNO
 extern int errno;
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 2efb88e328..f3da228933 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -342,10 +342,6 @@ int lfverify(struct LAR *lar, const char *filename);
 struct LFILE *lfopen(struct LAR *lar, const char *filename);
 int lfread(void *ptr, size_t size, size_t nmemb, struct LFILE *stream);
 
-#define SEEK_SET 0 /**< The seek offset is absolute. */
-#define SEEK_CUR 1 /**< The seek offset is against the current position. */
-#define SEEK_END 2 /**< The seek offset is against the end of the file. */
-
 int lfseek(struct LFILE *stream, long offset, int whence);
 int lfclose(struct LFILE *file);
 /** @} */
diff --git a/payloads/libpayload/include/limits.h b/payloads/libpayload/include/limits.h
new file mode 100644
index 0000000000..ae71dfdfa6
--- /dev/null
+++ b/payloads/libpayload/include/limits.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the libpayload project.
+ *
+ * Copyright (C) 2010 coresystems GmbH
+ *
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 _LIMITS_H
+#define _LIMITS_H
+
+#ifndef PATH_MAX
+# if defined(_POSIX_PATH_MAX)
+#  define PATH_MAX _POSIX_PATH_MAX
+# elif defined(MAXPATHLEN)
+#  define PATH_MAX MAXPATHLEN
+# else
+#  define PATH_MAX 255	/* the Posix minimum path-size */
+# endif
+#endif
+
+#endif
diff --git a/payloads/libpayload/include/stdio.h b/payloads/libpayload/include/stdio.h
index 2aea4459fa..73af2d18e6 100644
--- a/payloads/libpayload/include/stdio.h
+++ b/payloads/libpayload/include/stdio.h
@@ -43,4 +43,9 @@ int printf(const char *fmt, ...);
 
 void perror(const char *s);
 
+#define SEEK_SET 0 /**< The seek offset is absolute. */
+#define SEEK_CUR 1 /**< The seek offset is against the current position. */
+#define SEEK_END 2 /**< The seek offset is against the end of the file. */
+
+
 #endif