Split error-message table portions of errno.h out to gpxe/errortab.h

diff --git a/src/core/errno.c b/src/core/errno.c
index 83c8564bce0bc02e87bdb76915bd277405ed7b5f..84c3424aa8496f587099947052aa5f9acbea8838 100644 (file)
--- a/src/core/errno.c
+++ b/src/core/errno.c
@@ -1,6 +1,6 @@
-#include "etherboot.h"
-#include "errno.h"
-#include "vsprintf.h"
+#include <errno.h>
+#include <console.h>
+#include <gpxe/errortab.h>
 
 /** @file
  *

diff --git a/src/include/errno.h b/src/include/errno.h
index 68966bd96bbcb1baa137c7a4cf3644ebb1612fbd..43e207636e16a57122d8187a44682bc33e2e1f19 100644 (file)
--- a/src/include/errno.h
+++ b/src/include/errno.h
@@ -170,17 +170,6 @@
 #define ETIMEDOUT      0xf6    /**< Connection timed out */
 #define EWOULDBLOCK    EAGAIN  /**< Resource temporarily unavailable */
 
-/* Data structures and declarations */
-
-#include <gpxe/tables.h>
-
 extern int errno;
 
-struct errortab {
-       int errno;
-       const char *text;
-};
-
-#define __errortab __table(errortab,01)
-
 #endif /* ERRNO_H */

diff --git a/src/include/gpxe/errortab.h b/src/include/gpxe/errortab.h
new file mode 100644 (file)
index 0000000..1ca7fe5
--- /dev/null
+++ b/src/include/gpxe/errortab.h
@@ -0,0 +1,20 @@
+#ifndef _GPXE_ERRORTAB_H
+#define _GPXE_ERRORTAB_H
+
+/** @file
+ *
+ * Error message tables
+ *
+ */
+
+#include <errno.h>
+#include <gpxe/tables.h>
+
+struct errortab {
+       int errno;
+       const char *text;
+};
+
+#define __errortab __table ( errortab, 01 )
+
+#endif /* _GPXE_ERRORTAB_H */

diff --git a/src/interface/pxe/pxe_errors.c b/src/interface/pxe/pxe_errors.c
index dce50d77322f93cfe097890d4ec01beb100b42d2..3b00127bd376941f426230a7d7ac60b34287bbf5 100644 (file)
--- a/src/interface/pxe/pxe_errors.c
+++ b/src/interface/pxe/pxe_errors.c
@@ -1,4 +1,4 @@
-#include "errno.h"
+#include <gpxe/errortab.h>
 
 /*
  * This table was generated from the relevant section of errno.h using