From 8545542d711edf44bf12f9199bf2814e7129d6e6 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 19 Aug 2018 11:17:57 +0200
Subject: [PATCH] mescc: Cleanup includes.

* include/libmes-mini.h: New file.
* include/libmes.h: Use it.
---
 include/errno.h       |  4 +++
 include/libmes-mini.h | 72 +++++++++++++++++++++++++++++++++++++++++++
 include/libmes.h      | 39 ++---------------------
 3 files changed, 78 insertions(+), 37 deletions(-)
 create mode 100644 include/libmes-mini.h

diff --git a/include/errno.h b/include/errno.h
index 442934a6..c1453785 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -28,7 +28,11 @@
 #include_next <errno.h>
 #else // ! WITH_GLIBC
 
+#ifndef __MES_ERRNO_T
+#define __MES_ERRNO_T 1
 typedef int error_t;
+int errno;
+#endif // !__MES_ERRNO_T
 
 int errno;
 #define ENOENT   2
diff --git a/include/libmes-mini.h b/include/libmes-mini.h
new file mode 100644
index 00000000..28696418
--- /dev/null
+++ b/include/libmes-mini.h
@@ -0,0 +1,72 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MES_LIBMES_MINI_H
+#define __MES_LIBMES_MINI_H
+
+#ifndef _SIZE_T
+#define _SIZE_T
+#ifndef __SIZE_T
+#define __SIZE_T
+#ifndef __MES_SIZE_T
+#define __MES_SIZE_T
+#undef size_t
+typedef unsigned long size_t;
+#endif
+#endif
+#endif
+
+#ifndef _SSIZE_T
+#define _SSIZE_T
+#ifndef __SSIZE_T
+#define __SSIZE_T
+#ifndef __MES_SSIZE_T
+#define __MES_SSIZE_T
+#undef ssize_t
+typedef long ssize_t;
+#endif
+#endif
+#endif
+
+#ifndef STDIN
+#define STDIN 0
+#endif
+
+#ifndef STDOUT
+#define STDOUT 1
+#endif
+
+#ifndef STDERR
+#define STDERR 2
+#endif
+
+#ifndef __MES_ERRNO_T
+#define __MES_ERRNO_T 1
+typedef int error_t;
+int errno;
+#endif // !__MES_ERRNO_T
+
+size_t strlen (char const* s);
+ssize_t write (int filedes, void const *buffer, size_t size);
+int eputs (char const* s);
+int puts (char const* s);
+int oputs (char const* s);
+
+#endif //__MES_LIBMES_MINI_H
diff --git a/include/libmes.h b/include/libmes.h
index faa4be17..e7224739 100644
--- a/include/libmes.h
+++ b/include/libmes.h
@@ -21,51 +21,16 @@
 #ifndef __MES_LIBMES_H
 #define __MES_LIBMES_H
 
-#ifndef _SIZE_T
-#define _SIZE_T
-#ifndef __SIZE_T
-#define __SIZE_T
-#ifndef __MES_SIZE_T
-#define __MES_SIZE_T
-#undef size_t
-typedef unsigned long size_t;
-#endif
-#endif
-#endif
-
-#ifndef _SSIZE_T
-#define _SSIZE_T
-#ifndef __SSIZE_T
-#define __SSIZE_T
-#ifndef __MES_SSIZE_T
-#define __MES_SSIZE_T
-#undef ssize_t
-typedef long ssize_t;
-#endif
-#endif
-#endif
-
-#ifndef STDIN
-#define STDIN 0
-#endif
-
-#ifndef STDOUT
-#define STDOUT 1
-#endif
-
-#ifndef STDERR
-#define STDERR 2
-#endif
+#include <libmes-mini.h>
 
 int __mes_debug ();
+long abtol (char const** p, int base);
 char const* ntoab (long number, int base, int signed_p);
 char const* itoa (int number);
 char const* utoa (unsigned long number);
 char const* ltoab (long x, int base);
-int _atoi (char const**, int base);
 int atoi (char const *s);
 int eputc (int c);
-int eputs (char const* s);
 int fdgetc (int fd);
 int fdputc (int c, int fd);
 int fdputs (char const* s, int fd);