mescc: Mes C Library: Cleanup includes.

* include/mes/lib-mini.h: Move from include/libmes-mini.h.  Update users.
* include/mes/lib.h: Move from include/libmes.h.  Update users.

diff --git a/include/libmes-mini.h b/include/libmes-mini.h
deleted file mode 100644 (file)
index f93c901..0000000
--- a/include/libmes-mini.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*-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
-
-#if !WITH_GLIBC
-
-#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
-#if __i386__
-typedef int ssize_t;
-#else
-typedef long ssize_t;
-#endif
-#endif
-#endif
-#endif
-
-#ifndef __MES_ERRNO_T
-#define __MES_ERRNO_T 1
-typedef int error_t;
-int errno;
-#endif // !__MES_ERRNO_T
-
-#endif //!WITH_LIBC
-
-// CONSTANT STDIN 0
-#ifndef STDIN
-#define STDIN 0
-#endif
-
-// CONSTANT STDOUT 1
-#ifndef STDOUT
-#define STDOUT 1
-#endif
-
-// CONSTANT STDERR 2
-#ifndef STDERR
-#define STDERR 2
-#endif
-
-char **environ;
-int __stdin;
-int __stdout;
-int __stderr;
-
-int eputs (char const* s);
-int puts (char const* s);
-int oputs (char const* s);
-
-#if !WITH_GLIBC
-size_t strlen (char const* s);
-ssize_t write (int filedes, void const *buffer, size_t size);
-#endif // !WITH_GLIBC
-
-#endif //__MES_LIBMES_MINI_H

diff --git a/include/libmes.h b/include/libmes.h
deleted file mode 100644 (file)
index e15a0e4..0000000
--- a/include/libmes.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*-comment-start: "//";comment-end:""-*-
- * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 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_H
-#define __MES_LIBMES_H
-
-#include <libmes-mini.h>
-
-#if WITH_GLIBC
-int mes_open (char const *file_name, int flags, ...);
-#define open mes_open
-#endif
-
-int __mes_debug ();
-void __ungetc_init ();
-void __ungetc_clear (int filedes);
-void __ungetc_set (int filedes, int c);
-int __ungetc_p (int filedes);
-long abtol (char const **p, int base);
-char *itoa (int number);
-char *ltoa (long number);
-char *ltoab (long x, int base);
-char *ntoab (long number, int base, int signed_p);
-char *ultoa (unsigned long number);
-char *utoa (unsigned number);
-int atoi (char const *s);
-int eputc (int c);
-int fdgetc (int fd);
-int fdputc (int c, int fd);
-int fdputs (char const* s, int fd);
-int fdungetc (int c, int fd);
-int _fdungetc_p (int fd);
-int isdigit (int c);
-int isspace (int c);
-int isxdigit (int c);
-int _open3 (char const *file_name, int flags, int mask);
-int _open2 (char const *file_name, int flags);
-int oputc (int c);
-int oputs (char const* s);
-char *search_path (char const *file_name);
-
-#endif //__MES_LIBMES_H

diff --git a/include/mes/lib-mini.h b/include/mes/lib-mini.h
new file mode 100644 (file)
index 0000000..ed141a9
--- /dev/null
+++ b/include/mes/lib-mini.h
@@ -0,0 +1,92 @@
+/* -*-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_LIB_MINI_H
+#define __MES_LIB_MINI_H
+
+#if !WITH_GLIBC
+
+#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
+#if __i386__
+typedef int ssize_t;
+#else
+typedef long ssize_t;
+#endif
+#endif
+#endif
+#endif
+
+#ifndef __MES_ERRNO_T
+#define __MES_ERRNO_T 1
+typedef int error_t;
+int errno;
+#endif // !__MES_ERRNO_T
+
+#endif //!WITH_LIBC
+
+// CONSTANT STDIN 0
+#ifndef STDIN
+#define STDIN 0
+#endif
+
+// CONSTANT STDOUT 1
+#ifndef STDOUT
+#define STDOUT 1
+#endif
+
+// CONSTANT STDERR 2
+#ifndef STDERR
+#define STDERR 2
+#endif
+
+char **environ;
+int __stdin;
+int __stdout;
+int __stderr;
+
+int eputs (char const* s);
+int puts (char const* s);
+int oputs (char const* s);
+
+#if !WITH_GLIBC
+size_t strlen (char const* s);
+ssize_t _write ();
+ssize_t write (int filedes, void const *buffer, size_t size);
+#endif // !WITH_GLIBC
+
+#endif //__MES_LIB_MINI_H

diff --git a/include/mes/lib.h b/include/mes/lib.h
new file mode 100644 (file)
index 0000000..71fb8a1
--- /dev/null
+++ b/include/mes/lib.h
@@ -0,0 +1,59 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 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_LIB_H
+#define __MES_LIB_H
+
+#include <mes/lib-mini.h>
+
+#if WITH_GLIBC
+int mes_open (char const *file_name, int flags, ...);
+#define open mes_open
+#endif
+
+int __mes_debug ();
+void __ungetc_init ();
+void __ungetc_clear (int filedes);
+void __ungetc_set (int filedes, int c);
+int __ungetc_p (int filedes);
+long abtol (char const **p, int base);
+char *itoa (int number);
+char *ltoa (long number);
+char *ltoab (long x, int base);
+char *ntoab (long number, int base, int signed_p);
+char *ultoa (unsigned long number);
+char *utoa (unsigned number);
+int atoi (char const *s);
+int eputc (int c);
+int fdgetc (int fd);
+int fdputc (int c, int fd);
+int fdputs (char const* s, int fd);
+int fdungetc (int c, int fd);
+int _fdungetc_p (int fd);
+int isdigit (int c);
+int isspace (int c);
+int isxdigit (int c);
+int _open3 (char const *file_name, int flags, int mask);
+int _open2 (char const *file_name, int flags);
+int oputc (int c);
+int oputs (char const* s);
+char *search_path (char const *file_name);
+
+#endif //__MES_LIB_H

diff --git a/include/stdio.h b/include/stdio.h
index 9395d39b00cc157e8ca81f4e0270e3fc16b8e0f1..b305fe46a87754c9e02bb9a97e60e0aa30c573c8 100644 (file)
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -20,7 +20,7 @@
 #ifndef __MES_STDIO_H
 #define __MES_STDIO_H 1
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #if WITH_GLIBC
 #ifndef _GNU_SOURCE

diff --git a/lib/abtol.c b/lib/abtol.c
index 25b3afa6559675dd167261c0191a0110c8cc597a..2fc3d607669ff0e309f8451263b8d6bcb7ff2c41 100644 (file)
--- a/lib/abtol.c
+++ b/lib/abtol.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 long
 abtol (char const **p, int base)

diff --git a/lib/ctype/isdigit.c b/lib/ctype/isdigit.c
index b29b17286f2fef8a679b20018a473b4fdccbf806..71798cc28ef8790f348584781018f711b6e73966 100644 (file)
--- a/lib/ctype/isdigit.c
+++ b/lib/ctype/isdigit.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 isdigit (int c)

diff --git a/lib/ctype/isspace.c b/lib/ctype/isspace.c
index 2ac7a47c366b86e19b8f395995eebb3babc737cd..50f6e337e6d0535e992bea512fed10e6a171d9d8 100644 (file)
--- a/lib/ctype/isspace.c
+++ b/lib/ctype/isspace.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 isspace (int c)

diff --git a/lib/ctype/isxdigit.c b/lib/ctype/isxdigit.c
index 9a3bfe6a96649fe1606818848ba503c2265943c3..54b28571dd1580f042d7a98e9531ce38ef0fcee9 100644 (file)
--- a/lib/ctype/isxdigit.c
+++ b/lib/ctype/isxdigit.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 isxdigit (int c)

diff --git a/lib/libc.c b/lib/libc.c
index b37fc9bd7a250850652fe7b8e50b54cc20fa5cec..27abb994ff302598469272975a131d776dc1819d 100644 (file)
--- a/lib/libc.c
+++ b/lib/libc.c
@@ -21,10 +21,10 @@
 #include <sys/ioctl.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/lib/libmes.c b/lib/libmes.c
index 49974b675e7df2d96372cf258922632a76a655c6..d002fa16c0fb42a13c9e58cfafdd5d9f6d09bce1 100644 (file)
--- a/lib/libmes.c
+++ b/lib/libmes.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/lib/libtcc1.c b/lib/libtcc1.c
index 1ae0fa69decf7f78b537944eac55c6e011629387..64e2ce4c80f4097cb3bba61387c7b6e973e8a001 100644 (file)
--- a/lib/libtcc1.c
+++ b/lib/libtcc1.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 double
 __divdi3 (double a, double b)

diff --git a/lib/linux/libc.c b/lib/linux/libc.c
index 7f6a1fc70165888f563b152b307df58da7f9b0a0..b08db6ba1b54c6e084940c8059c49ae6cbeaeab1 100644 (file)
--- a/lib/linux/libc.c
+++ b/lib/linux/libc.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <fcntl.h>
 #include <limits.h>

diff --git a/lib/linux/x86-mes-gcc/crt0.c b/lib/linux/x86-mes-gcc/crt0.c
index 668cea15f82bb5e9beca8dff3ed1d80927aebff5..8f46282f5526561170a8c533bb81ebbfda5d85be 100644 (file)
--- a/lib/linux/x86-mes-gcc/crt0.c
+++ b/lib/linux/x86-mes-gcc/crt0.c
@@ -23,7 +23,7 @@
 // instead of calling main, it seems to call either _main or ___main,
 // let's try _main first
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 int _main (int argc, char *argv[]);
 
 void

diff --git a/lib/linux/x86-mes-gcc/crt1.c b/lib/linux/x86-mes-gcc/crt1.c
index 859469feea38d65b5ee55ed774c98d5e680ca04d..a1c721e2870cadf417939a6eaf5377b5c92606e7 100644 (file)
--- a/lib/linux/x86-mes-gcc/crt1.c
+++ b/lib/linux/x86-mes-gcc/crt1.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 //int main (int argc, char *argv[], char *envp[]);
 
 void

diff --git a/lib/linux/x86-mes/crt1.c b/lib/linux/x86-mes/crt1.c
index a93b519bc197f4b7fc8d7166ca5fa58df30c6e10..e4ef3c383bedf37a615f232b28b6a7b68010722f 100644 (file)
--- a/lib/linux/x86-mes/crt1.c
+++ b/lib/linux/x86-mes/crt1.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libmes-mini.h"
+#include "mes/lib-mini.h"
 
 int main (int argc, char *argv[], char *envp[]);
 

diff --git a/lib/linux/x86_64-mes-gcc/crt0.c b/lib/linux/x86_64-mes-gcc/crt0.c
index d744d90c7eaa2680dc6ad149723578755bd34b0c..b0fd0357b293a49b4e8a845061db6e60bfdab288 100644 (file)
--- a/lib/linux/x86_64-mes-gcc/crt0.c
+++ b/lib/linux/x86_64-mes-gcc/crt0.c
@@ -23,7 +23,7 @@
 // instead of calling main, it seems to call either _main or ___main,
 // let's try _main first
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 int main (int argc, char *argv[]);
 
 // gcc x86_64 calling convention:

diff --git a/lib/linux/x86_64-mes-gcc/crt1.c b/lib/linux/x86_64-mes-gcc/crt1.c
index 89af8e4c80c3cc29f6674ef69cd4bcb893ae795e..ed4cacef70d982610b9d5feac5dbe0ba94dc3e42 100644 (file)
--- a/lib/linux/x86_64-mes-gcc/crt1.c
+++ b/lib/linux/x86_64-mes-gcc/crt1.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 // int main (int argc, char *argv[]);
 
 // gcc x86_64 calling convention:

diff --git a/lib/linux/x86_64-mes/crt1.c b/lib/linux/x86_64-mes/crt1.c
index d3bce2338acb44718f71e54e59c3f9063ea83641..6449a99d1034e36f2b404a4dade0eaf627dd9618 100644 (file)
--- a/lib/linux/x86_64-mes/crt1.c
+++ b/lib/linux/x86_64-mes/crt1.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libmes-mini.h"
+#include "mes/lib-mini.h"
 int main (int argc, char *argv[], char *envp[]);
 
 int

diff --git a/lib/mes/abtol.c b/lib/mes/abtol.c
index e0c30f42832dcf09ca54f6e482a8660702ca4f3e..d16a6ea43b6779db5a96c061630f799300b11937 100644 (file)
--- a/lib/mes/abtol.c
+++ b/lib/mes/abtol.c
@@ -18,7 +18,8 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
+#include <ctype.h>
 
 long
 abtol (char const **p, int base)

diff --git a/lib/mes/eputc.c b/lib/mes/eputc.c
index 7164fd74bf796e33bc30f1daea046151d4e75248..05fc9837e96baab2dd2b47d4b6fb15bdd16dd76b 100644 (file)
--- a/lib/mes/eputc.c
+++ b/lib/mes/eputc.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 eputc (int c)

diff --git a/lib/mes/eputs.c b/lib/mes/eputs.c
index db7b26d5f5a36babe2380b46ecb4800f179a2ead..bc3997af15fedf627e0404602c04e252d5410bb6 100644 (file)
--- a/lib/mes/eputs.c
+++ b/lib/mes/eputs.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 eputs (char const* s)

diff --git a/lib/mes/fdgetc.c b/lib/mes/fdgetc.c
index 09bca8b6417ecd378ff5f6b6afd49cae6b3eaa2c..373474c691913dece1f4b4e4fd6428ce7a20c901 100644 (file)
--- a/lib/mes/fdgetc.c
+++ b/lib/mes/fdgetc.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <limits.h>
 #include <sys/resource.h>
 

diff --git a/lib/mes/fdputc.c b/lib/mes/fdputc.c
index 14f4f6f6a20c614682972a7280e695fe357b2dc6..bd1eda43940460374fbce9dcbc1f90eff158cd43 100644 (file)
--- a/lib/mes/fdputc.c
+++ b/lib/mes/fdputc.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 fdputc (int c, int fd)

diff --git a/lib/mes/fdputs.c b/lib/mes/fdputs.c
index 472799cdd4ecefe1b76cd34e0f03f9a7bad353ea..784fc0c5e56857133dd8cea91475b2139e26e4dc 100644 (file)
--- a/lib/mes/fdputs.c
+++ b/lib/mes/fdputs.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 fdputs (char const* s, int fd)

diff --git a/lib/mes/fdungetc.c b/lib/mes/fdungetc.c
index 06d59b280a3039797011ab5c0e230d4a102a6646..05d286620b14873307a2a13677f10dd0849f8855 100644 (file)
--- a/lib/mes/fdungetc.c
+++ b/lib/mes/fdungetc.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 fdungetc (int c, int fd)

diff --git a/lib/mes/itoa.c b/lib/mes/itoa.c
index 95b6d034a58d3d796a35e2c5347e4c0088d1109c..b274ac09b7b1278931c2a347935dc76f922b189e 100644 (file)
--- a/lib/mes/itoa.c
+++ b/lib/mes/itoa.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 char *
 itoa (int x)

diff --git a/lib/mes/ltoa.c b/lib/mes/ltoa.c
index 8b91566e7943be85c673e1ff317e70be6284c608..f4829a8037b158ed897848acf03d216c697d5601 100644 (file)
--- a/lib/mes/ltoa.c
+++ b/lib/mes/ltoa.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 char *
 ltoa (long x)

diff --git a/lib/mes/ltoab.c b/lib/mes/ltoab.c
index 7aee68cc14203834fb5e5064597d0e92fc5fa8b5..561123074f76d8866a9597d3c64f1f5c03290f2d 100644 (file)
--- a/lib/mes/ltoab.c
+++ b/lib/mes/ltoab.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 char *
 ltoab (long x, int base)

diff --git a/lib/mes/ntoab.c b/lib/mes/ntoab.c
index 5fcfe5ac6a96cb629e225cc904dd813fbdd568e1..26e60fe953d8ccfeed6a877ccf41f3c754bb6607 100644 (file)
--- a/lib/mes/ntoab.c
+++ b/lib/mes/ntoab.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 char *
 ntoab (long x, int base, int signed_p)

diff --git a/lib/mes/oputc.c b/lib/mes/oputc.c
index ba47365a36d66d0282a94f68350b70f4d0e14a94..95fc1648bba232b24a41dd6f6f3575fd119a98e9 100644 (file)
--- a/lib/mes/oputc.c
+++ b/lib/mes/oputc.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 oputc (int c)

diff --git a/lib/mes/oputs.c b/lib/mes/oputs.c
index 3f5f4905ab44943fd36dc32cdcc86233922591cf..82731528d3163277e071d9310da94feee397590e 100644 (file)
--- a/lib/mes/oputs.c
+++ b/lib/mes/oputs.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 oputs (char const* s)

diff --git a/lib/mes/search-path.c b/lib/mes/search-path.c
index 7db5957852bc3858c68a7aa82c32c42c9af4d962..035ac6c1140dcd837a9e5d6c83c6600fba030e16 100644 (file)
--- a/lib/mes/search-path.c
+++ b/lib/mes/search-path.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 char *
 search_path (char const *file_name)

diff --git a/lib/mes/ultoa.c b/lib/mes/ultoa.c
index c3099d3eb029fda7911bca5b105450de68dc67b2..3319296bc2e4dafb59c6161f9c6848a612e9c0ef 100644 (file)
--- a/lib/mes/ultoa.c
+++ b/lib/mes/ultoa.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 char *
 ultoa (unsigned long x)

diff --git a/lib/mes/utoa.c b/lib/mes/utoa.c
index 742e04ce0d0ea3e21f9509d393b6394f45e09e75..63370bfcfdb81f5429040870afc2ccc958a6fbc5 100644 (file)
--- a/lib/mes/utoa.c
+++ b/lib/mes/utoa.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 char *
 utoa (unsigned x)

diff --git a/lib/posix/execl.c b/lib/posix/execl.c
index 2142acde283d562346c3ce9f3bd86aac30add7f2..e5f89c1b8318dc967b9b17863129f0580d1e5b23 100644 (file)
--- a/lib/posix/execl.c
+++ b/lib/posix/execl.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <unistd.h>
 
 int

diff --git a/lib/posix/execvp.c b/lib/posix/execvp.c
index 15d846041f82f9085628d4d55fc120f0b5a2a78b..74476d8a62b1773fea5081746aced4292e3cab86 100644 (file)
--- a/lib/posix/execvp.c
+++ b/lib/posix/execvp.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <unistd.h>
 
 int

diff --git a/lib/stdio/fopen.c b/lib/stdio/fopen.c
index 2a73ddd38c47d345150b1d2c8be3e79be47a4344..05ec8bbf3fe187a3f2d9a947d941e2f3a579d108 100644 (file)
--- a/lib/stdio/fopen.c
+++ b/lib/stdio/fopen.c
@@ -19,7 +19,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 
 //#if __GNUC__ && __x86_64__

diff --git a/lib/stdio/fread.c b/lib/stdio/fread.c
index 593f8dedf5388341b06193bebf2d5cb50d1af17f..58a2c4c2126c3c093c662f496320c422cf444358 100644 (file)
--- a/lib/stdio/fread.c
+++ b/lib/stdio/fread.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 
 int

diff --git a/lib/stdio/fseek.c b/lib/stdio/fseek.c
index f53c7b725406fc87f743dd7f295f584519b87a34..281bfca0c70e78dd892fdc96d32b2aa147336549 100644 (file)
--- a/lib/stdio/fseek.c
+++ b/lib/stdio/fseek.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 
 int

diff --git a/lib/stdio/fwrite.c b/lib/stdio/fwrite.c
index 7fc163deb240aff0734ef070388e37389f1f2d18..533f3fd34c1978dbe38c22bdb5b8fb9cd797505d 100644 (file)
--- a/lib/stdio/fwrite.c
+++ b/lib/stdio/fwrite.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 
 size_t

diff --git a/lib/stdio/vfprintf.c b/lib/stdio/vfprintf.c
index 1e3cc3eabed46efb9474a949f34b0df70c04c957..2b251246ce5c410c8e992c94989c32c45a332cf6 100644 (file)
--- a/lib/stdio/vfprintf.c
+++ b/lib/stdio/vfprintf.c
@@ -18,6 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <mes/lib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/lib/stdio/vsnprintf.c b/lib/stdio/vsnprintf.c
index e949a3f5daf8e82dc48477e54cdc347cf078b123..2021227e646db19095c228cb2e1d261fd5014e1f 100644 (file)
--- a/lib/stdio/vsnprintf.c
+++ b/lib/stdio/vsnprintf.c
@@ -18,8 +18,9 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <mes/lib.h>
+#include <stdarg.h>
+#include <string.h>
 
 int
 vsnprintf (char *str, size_t size, char const* format, va_list ap)

diff --git a/lib/stdio/vsscanf.c b/lib/stdio/vsscanf.c
index e1604448b3d3efbf39ce4c22453915921e985916..23aa3053d2c7452d53ddb033deb159aa7e95f2e3 100644 (file)
--- a/lib/stdio/vsscanf.c
+++ b/lib/stdio/vsscanf.c
@@ -18,6 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <mes/lib.h>
 #include <stdarg.h>
 #include <stdio.h>
 

diff --git a/lib/stdlib/atoi.c b/lib/stdlib/atoi.c
index cc02dca4b78e9c84d2c4d454f19bd564df712c8d..3f113723c76cedb48320c045084e59f94bcafca0 100644 (file)
--- a/lib/stdlib/atoi.c
+++ b/lib/stdlib/atoi.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 atoi (char const *s)

diff --git a/lib/stdlib/exit.c b/lib/stdlib/exit.c
index 29be6d12c13aeadb3fe2777da1d554511ffff770..252ecf9218268d80cf5182b944b016b147b0e557 100644 (file)
--- a/lib/stdlib/exit.c
+++ b/lib/stdlib/exit.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 void (*__call_at_exit) (void);
 

diff --git a/lib/stdlib/puts.c b/lib/stdlib/puts.c
index be51f47b07fd3af7b2be7e40bc332b93989163f3..d7ada8b7fa792d6927233383384d13a1b3983e92 100644 (file)
--- a/lib/stdlib/puts.c
+++ b/lib/stdlib/puts.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 puts (char const* s)

diff --git a/lib/stdlib/strtol.c b/lib/stdlib/strtol.c
index 3a5f7a14b8ab9a0f24387132615894b2aa65df86..0c592b2d1a4fb00abb34bfe334025b296bbcef3b 100644 (file)
--- a/lib/stdlib/strtol.c
+++ b/lib/stdlib/strtol.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdlib.h>
 
 long

diff --git a/lib/string/strlen.c b/lib/string/strlen.c
index 0f6df8ad3a39a7ebb1dbd5f77d65fe3e647c60c5..5d9446b431345db234273abecf3c31205783c7fe 100644 (file)
--- a/lib/string/strlen.c
+++ b/lib/string/strlen.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 size_t
 strlen (char const* s)

diff --git a/lib/stub/__cleanup.c b/lib/stub/__cleanup.c
index f7299fca83a063c17c59c959ac38ddf634ea29d6..0b90e564b0cccc7f00601f9870452ebf763797de 100644 (file)
--- a/lib/stub/__cleanup.c
+++ b/lib/stub/__cleanup.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 __cleanup ()

diff --git a/lib/stub/atof.c b/lib/stub/atof.c
index 3cc951d91ae98994a50e461a348c35871511491e..19f6771d97ea4d36605cee6e695be1d38962c6f5 100644 (file)
--- a/lib/stub/atof.c
+++ b/lib/stub/atof.c
@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 atof (int x)

diff --git a/lib/stub/chown.c b/lib/stub/chown.c
index bf44169a042ae2673279859dd96e9cd3957868ec..3fc5e4c47c775641a07bec24d28da6c0712efe3e 100644 (file)
--- a/lib/stub/chown.c
+++ b/lib/stub/chown.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <unistd.h>
 
 int

diff --git a/lib/stub/ctime.c b/lib/stub/ctime.c
index 30c7475bcb56eca1f8f8b6b9051fdfeb8335a07f..859fc36cc973c84382e9a6776870edefb7f122ce 100644 (file)
--- a/lib/stub/ctime.c
+++ b/lib/stub/ctime.c
@@ -18,7 +18,8 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
+#include <time.h>
 
 int
 ctime (int x)

diff --git a/lib/stub/fpurge.c b/lib/stub/fpurge.c
index 991cd493a277109c83c046e909b75769f21fe6a7..2e923da4e583e100d181db98066a9304ce145e6d 100644 (file)
--- a/lib/stub/fpurge.c
+++ b/lib/stub/fpurge.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 
 int

diff --git a/lib/stub/freadahead.c b/lib/stub/freadahead.c
index 136b03a7d02d511fd4a7955ef3a7e6ac74695a8f..0c3f99694e48e3fec7bf728c0f5b60c0b865fdaa 100644 (file)
--- a/lib/stub/freadahead.c
+++ b/lib/stub/freadahead.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 
 size_t

diff --git a/lib/stub/frexp.c b/lib/stub/frexp.c
index 22c1e6cf53aaae11f0660c77178d5112dd39b6d7..f26e1aead6c003684843e20d9b2d2d0ddbc4d795 100644 (file)
--- a/lib/stub/frexp.c
+++ b/lib/stub/frexp.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 frexp (int x)

diff --git a/lib/stub/fscanf.c b/lib/stub/fscanf.c
index daae853da331d70133ea54c558be7cc5383e91ec..c6497483de44f26911fc620eebb417e087303d9e 100644 (file)
--- a/lib/stub/fscanf.c
+++ b/lib/stub/fscanf.c
@@ -18,8 +18,8 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
-#include <stdio.h>
+#include <mes/lib.h>
+#include <unistd.h>
 
 int
 fscanf (FILE *stream, char const *template, ...)

diff --git a/lib/stub/getlogin.c b/lib/stub/getlogin.c
index 725929f7eacc4e4440ff16f008c47824ba727788..5420f320d33511b6548a1afbdc37d3defdd8fc23 100644 (file)
--- a/lib/stub/getlogin.c
+++ b/lib/stub/getlogin.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <unistd.h>
 
 char *

diff --git a/lib/stub/getpwnam.c b/lib/stub/getpwnam.c
index 472b42aabc7515e953c7f0158efad42ab97bc3b6..c37d895f056160023e5168f43877dd13ed7d56e4 100644 (file)
--- a/lib/stub/getpwnam.c
+++ b/lib/stub/getpwnam.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <pwd.h>
 
 struct passwd *

diff --git a/lib/stub/getpwuid.c b/lib/stub/getpwuid.c
index 647fd54e45539a77cf622a7b898bf93a62b8f69e..4081ffa30cc560a428fa192019f39bb6aaa13513 100644 (file)
--- a/lib/stub/getpwuid.c
+++ b/lib/stub/getpwuid.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <pwd.h>
 
 struct passwd *

diff --git a/lib/stub/gmtime.c b/lib/stub/gmtime.c
index 85e45dddef53d8bd324bc11fc6ffcc27f0c7ef0c..c1b262b92754422b2eec06c21fe6363a7160d12c 100644 (file)
--- a/lib/stub/gmtime.c
+++ b/lib/stub/gmtime.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <time.h>
 #include <sys/time.h>
 

diff --git a/lib/stub/ldexp.c b/lib/stub/ldexp.c
index 9e28e4c500ba014e16a82b3de8c8b88e9d04875f..d7c4c071238bc5b61f6c2d47c59e87c843b81194 100644 (file)
--- a/lib/stub/ldexp.c
+++ b/lib/stub/ldexp.c
@@ -18,8 +18,8 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
-#include <stdlib.h>
+#include <mes/lib.h>
+#include <math.h>
 
 double
 ldexp (double x, int exp)

diff --git a/lib/stub/localtime.c b/lib/stub/localtime.c
index 5010557cff3ea8ad8f41c0460ba3cc43f75e3e5e..308ef4000dc063aa198e792bc19348792815fec0 100644 (file)
--- a/lib/stub/localtime.c
+++ b/lib/stub/localtime.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <time.h>
 #include <sys/time.h>
 

diff --git a/lib/stub/mprotect.c b/lib/stub/mprotect.c
index 09ce99a0f5ab91f3b63e8fd25ee7cf3960ade93c..c3a66eae7d76523312fb18a8200d9b3a340eb023 100644 (file)
--- a/lib/stub/mprotect.c
+++ b/lib/stub/mprotect.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <string.h>
 
 int

diff --git a/lib/stub/pclose.c b/lib/stub/pclose.c
index 244bcc744b6e9ed469d8acd85d85e192cd6425c5..88806f6b08ba1894a565f7909a01015747b2013f 100644 (file)
--- a/lib/stub/pclose.c
+++ b/lib/stub/pclose.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 pclose (int x)

diff --git a/lib/stub/popen.c b/lib/stub/popen.c
index 294a24c3ba07915dc48fc953f011b4cf6b0d9e5b..ee4cf63d8de4b0e12aba44db91b6002c6765f924 100644 (file)
--- a/lib/stub/popen.c
+++ b/lib/stub/popen.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 popen (int x)

diff --git a/lib/stub/rand.c b/lib/stub/rand.c
index 2e07282f223b80e43a88f41e72d4c09488547efc..21365edb7cd7e60e8840a9b2de1204106cc7b61b 100644 (file)
--- a/lib/stub/rand.c
+++ b/lib/stub/rand.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <pwd.h>
 
 int

diff --git a/lib/stub/rewind.c b/lib/stub/rewind.c
index e62d3fb80683a95110be4cff199f3fad2a66c4d3..b00275511a34aeeb0acbefd8b3677e4e3e790a7f 100644 (file)
--- a/lib/stub/rewind.c
+++ b/lib/stub/rewind.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 rewind (int x)

diff --git a/lib/stub/setbuf.c b/lib/stub/setbuf.c
index debf05b729197a542bc7ac9b9ce85930800e1e03..b0d3e4bc54200649f6f68734e7bb8950023ba1dc 100644 (file)
--- a/lib/stub/setbuf.c
+++ b/lib/stub/setbuf.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 setbuf (int x)

diff --git a/lib/stub/setlocale.c b/lib/stub/setlocale.c
index e4fe783fcc1d1de25d4cbe0f32e824c7318a6754..7005ba4366b64152ca3aae894d777f60eab14ade 100644 (file)
--- a/lib/stub/setlocale.c
+++ b/lib/stub/setlocale.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <locale.h>
 
 char *

diff --git a/lib/stub/setvbuf.c b/lib/stub/setvbuf.c
index 1abe6639f8a1012601957a982ae8f9d6884bb1c8..66751b913baa45675a25602e0b90f7a7ba459c7e 100644 (file)
--- a/lib/stub/setvbuf.c
+++ b/lib/stub/setvbuf.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 
 int

diff --git a/lib/stub/sigaction.c b/lib/stub/sigaction.c
index 683ddf35a05d8762a1cdb302197630327708629d..304392e501a2d7d6472a2b59ba49c20a20e59bc8 100644 (file)
--- a/lib/stub/sigaction.c
+++ b/lib/stub/sigaction.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <signal.h>
 
 int

diff --git a/lib/stub/sigaddset.c b/lib/stub/sigaddset.c
index 063c5ac9755f9df1b69b2c7d21b33c5d839db318..3259a0548ab5849b6f428924ae66f413a1ec3d17 100644 (file)
--- a/lib/stub/sigaddset.c
+++ b/lib/stub/sigaddset.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <signal.h>
 
 int

diff --git a/lib/stub/sigblock.c b/lib/stub/sigblock.c
index 766b1c87a6dd87b5a0d16029ea77a39fda3a4bec..241331affe4f648ddace7af18fdf391fd9bcf206 100644 (file)
--- a/lib/stub/sigblock.c
+++ b/lib/stub/sigblock.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <signal.h>
 
 int

diff --git a/lib/stub/sigdelset.c b/lib/stub/sigdelset.c
index a9335a2ce9f482fd95de65f33f62293ce2420c9f..78312e0e181fa395d59d5bb2c789cacf05ffce78 100644 (file)
--- a/lib/stub/sigdelset.c
+++ b/lib/stub/sigdelset.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <signal.h>
 
 int

diff --git a/lib/stub/sigemptyset.c b/lib/stub/sigemptyset.c
index 337e3f8c15670938a67852014b6b5bf04f84e3d5..de7f2a29c1ae80189179cc6073e2d10c1fd04a7e 100644 (file)
--- a/lib/stub/sigemptyset.c
+++ b/lib/stub/sigemptyset.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <signal.h>
 
 int

diff --git a/lib/stub/sigsetmask.c b/lib/stub/sigsetmask.c
index 4c6b570cee5c3aaaf3e9b14f25f2da0b8c08d374..f455ce061a7ec963b63e61e967c89d1a02322895 100644 (file)
--- a/lib/stub/sigsetmask.c
+++ b/lib/stub/sigsetmask.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 sigsetmask (int x)

diff --git a/lib/stub/strftime.c b/lib/stub/strftime.c
index ad7a26be08617d97e7d319ce1672cd43b056fbb0..02b16cc6d8198b055dcfdd373e60549fcfaf1a78 100644 (file)
--- a/lib/stub/strftime.c
+++ b/lib/stub/strftime.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 size_t
 strftime (char *s, size_t size, char const *template,

diff --git a/lib/stub/strtod.c b/lib/stub/strtod.c
index 9a74fe0ffb327583b1c894fb8a6c1c50159770a7..4638fcae4ed15a039e2d7be126858eeb21415223 100644 (file)
--- a/lib/stub/strtod.c
+++ b/lib/stub/strtod.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdlib.h>
 
 double

diff --git a/lib/stub/sys_siglist.c b/lib/stub/sys_siglist.c
index 6f4aef3532516be8935272fac864424758e99781..97411002d1e77cec9e2a3276bd1baeeb31ef6418 100644 (file)
--- a/lib/stub/sys_siglist.c
+++ b/lib/stub/sys_siglist.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 sys_siglist (int x)

diff --git a/lib/stub/system.c b/lib/stub/system.c
index 401854aa0a2314cc7f00613dae21b74544639521..8cfdd1deac7f08a42d6a52fa60da9effc7c8d958 100644 (file)
--- a/lib/stub/system.c
+++ b/lib/stub/system.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 system (int x)

diff --git a/lib/stub/times.c b/lib/stub/times.c
index 4de69cbd9cede6c005a4db151f3f65f8edbe714e..3aed3f482e55ba0fbd9d4785009f770bcf40cc0f 100644 (file)
--- a/lib/stub/times.c
+++ b/lib/stub/times.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <sys/times.h>
 #include <sys/time.h>
 

diff --git a/lib/stub/ttyname.c b/lib/stub/ttyname.c
index 093e5c0657930f487d7198da4b283fcf550912ba..12359387a928c5e096ca32c7936ee5a3ad1a046f 100644 (file)
--- a/lib/stub/ttyname.c
+++ b/lib/stub/ttyname.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <unistd.h>
 
 char *

diff --git a/lib/stub/umask.c b/lib/stub/umask.c
index 41c736b684e0f185e615a2560a262b2a25503383..ca2e2ec987b17685d87d3530b08205467bb001f3 100644 (file)
--- a/lib/stub/umask.c
+++ b/lib/stub/umask.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 umask (int x)

diff --git a/lib/stub/utime.c b/lib/stub/utime.c
index 67247c9ae391c8372f101bda20efbbd9cc40e01f..06c8a67aeecbd3d7ff0d6d9ae3f96b2b4090a776 100644 (file)
--- a/lib/stub/utime.c
+++ b/lib/stub/utime.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 utime (int x)

diff --git a/lib/tests/assert/50-assert.c b/lib/tests/assert/50-assert.c
index 73c197d81455169faee7692948aa99763a9673f1..7b5c7a98f75d177f74296c59262cc4c3fd39f335 100644 (file)
--- a/lib/tests/assert/50-assert.c
+++ b/lib/tests/assert/50-assert.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <assert.h>
 #include <stdio.h>
 

diff --git a/lib/tests/dirent/90-readdir.c b/lib/tests/dirent/90-readdir.c
index 5b4043be907b6d3068942d8e32e679075d411e58..3e89e1d5d752bb84af1dfcca820f20453da3f8ce 100644 (file)
--- a/lib/tests/dirent/90-readdir.c
+++ b/lib/tests/dirent/90-readdir.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <dirent.h>
 #include <errno.h>

diff --git a/lib/tests/mes/30-oputs.c b/lib/tests/mes/30-oputs.c
index 62c2811f033ab77ee865fe62b4b183599b2df1bb..eaa5df34c3d47c8c364358148ea20ed9670d014f 100644 (file)
--- a/lib/tests/mes/30-oputs.c
+++ b/lib/tests/mes/30-oputs.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 #if 0
 #include <linux/x86_64/syscall.h>

diff --git a/lib/tests/mes/50-itoa.c b/lib/tests/mes/50-itoa.c
index dd856fb225c09af20c3b547805411fba5e7406e3..bd4a1be124cdcf3a8bd9822061f9838178e8ed7d 100644 (file)
--- a/lib/tests/mes/50-itoa.c
+++ b/lib/tests/mes/50-itoa.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <string.h>
 
 int

diff --git a/lib/tests/posix/50-getenv.c b/lib/tests/posix/50-getenv.c
index 2397c1642a4c75f81a53f02099089c063d3d838c..e1c743447321bc2672264f8cf39ff79485644172 100644 (file)
--- a/lib/tests/posix/50-getenv.c
+++ b/lib/tests/posix/50-getenv.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libmes.h"
+#include "mes/lib.h"
 #include "stdlib.h"
 
 int

diff --git a/lib/tests/posix/90-unsetenv.c b/lib/tests/posix/90-unsetenv.c
index ccf8f8287ad478fd68847359c1443b6b544b4b7b..2ec154eed359a1ccba7ade7a419dba9dd619a326 100644 (file)
--- a/lib/tests/posix/90-unsetenv.c
+++ b/lib/tests/posix/90-unsetenv.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>

diff --git a/lib/tests/setjmp/80-setjmp.c b/lib/tests/setjmp/80-setjmp.c
index 8c07349c595b1dcaadbf24e7ce54dc7866a0a83b..64228846b1da38fda1c9f46eb8d32d24ab9d3c2e 100644 (file)
--- a/lib/tests/setjmp/80-setjmp.c
+++ b/lib/tests/setjmp/80-setjmp.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/lib/tests/signal/90-signal.c b/lib/tests/signal/90-signal.c
index 380209d68cb77d8182677353238cb94192b8865c..fb6e3a7f974a93aa4864ce2e3372d3e60e0ad37f 100644 (file)
--- a/lib/tests/signal/90-signal.c
+++ b/lib/tests/signal/90-signal.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/lib/tests/stdio/70-printf-hello.c b/lib/tests/stdio/70-printf-hello.c
index f61246aface07abdcef568a408d0aab50ceb86f3..598ba355d057533ac55e6e48b043ef611444c8f2 100644 (file)
--- a/lib/tests/stdio/70-printf-hello.c
+++ b/lib/tests/stdio/70-printf-hello.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/lib/tests/stdio/70-printf-simple.c b/lib/tests/stdio/70-printf-simple.c
index 02814bc0855540b540a567b2732a4fe251c72c20..aba3bae5bc397a8cf0783547e31ba6e02a66616a 100644 (file)
--- a/lib/tests/stdio/70-printf-simple.c
+++ b/lib/tests/stdio/70-printf-simple.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/lib/tests/stdio/70-printf.c b/lib/tests/stdio/70-printf.c
index a44e516b438c0884e8fe8070486faef13e5c89be..43a482b7232a5f412d734e8b30a380f544703210 100644 (file)
--- a/lib/tests/stdio/70-printf.c
+++ b/lib/tests/stdio/70-printf.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/lib/tests/stdio/80-sscanf.c b/lib/tests/stdio/80-sscanf.c
index 7691eba20ca7012e1c92d8a0db6b17cf24f26385..7d8acaac3ca2054b7f7ba0e6ac5fb3c5261c40c9 100644 (file)
--- a/lib/tests/stdio/80-sscanf.c
+++ b/lib/tests/stdio/80-sscanf.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/lib/tests/stdio/90-fopen-append.c b/lib/tests/stdio/90-fopen-append.c
index 23f7778009ff12b60ba183ac90a905a514be33fc..7226578f59f26bf2892460ad99a88fada49607e5 100644 (file)
--- a/lib/tests/stdio/90-fopen-append.c
+++ b/lib/tests/stdio/90-fopen-append.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>

diff --git a/lib/tests/stdio/90-fopen.c b/lib/tests/stdio/90-fopen.c
index 2b1dc1bee17fda47b2b046d06b3846db337073bb..b304c9b4f0939de4df9f857ed06da6756f9a68a7 100644 (file)
--- a/lib/tests/stdio/90-fopen.c
+++ b/lib/tests/stdio/90-fopen.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <fcntl.h>
 #include <unistd.h>

diff --git a/lib/tests/stdio/90-fread-fwrite.c b/lib/tests/stdio/90-fread-fwrite.c
index 60bced5ca96a998c7351c4a1d144b7e0c6b1b945..dfd507e2a9a00bb4c8376bd5b169b7ffdd2f1a2e 100644 (file)
--- a/lib/tests/stdio/90-fread-fwrite.c
+++ b/lib/tests/stdio/90-fread-fwrite.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>

diff --git a/lib/tests/stdio/90-fseek.c b/lib/tests/stdio/90-fseek.c
index be3f5a5406654c0d43a5642658cf164cbd1824d8..6e4318d0f4dd4f0e4d31999c9f7fd57fd94a208e 100644 (file)
--- a/lib/tests/stdio/90-fseek.c
+++ b/lib/tests/stdio/90-fseek.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>

diff --git a/lib/tests/stdlib/50-malloc.c b/lib/tests/stdlib/50-malloc.c
index fd3cb8e3801f31251d52f66afa463f3c618eb99b..c3af98f4f1b8451dc8b9fe6ab722b5c40d5a0905 100644 (file)
--- a/lib/tests/stdlib/50-malloc.c
+++ b/lib/tests/stdlib/50-malloc.c
@@ -22,7 +22,7 @@
 #error "WITH_GLIBC not supported"
 #endif
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/lib/tests/stdlib/70-strtoull.c b/lib/tests/stdlib/70-strtoull.c
index 20b9864578df9bd02ef9612b647bd5c66f506bc6..bc88e8ae0430b7d1ecc9df68908ad03144288ba1 100644 (file)
--- a/lib/tests/stdlib/70-strtoull.c
+++ b/lib/tests/stdlib/70-strtoull.c
@@ -18,8 +18,8 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
-#include <libmes.h>
+#include <mes/lib.h>
+#include <mes/lib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/lib/tests/stdlib/80-qsort-dupes.c b/lib/tests/stdlib/80-qsort-dupes.c
index 7a9490237eae3a4fbfbb6dc7e562b7d3dae9f037..96934547903ac5be23cff2601628aa443cf8dd40 100644 (file)
--- a/lib/tests/stdlib/80-qsort-dupes.c
+++ b/lib/tests/stdlib/80-qsort-dupes.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <string.h>
 
 int

diff --git a/lib/tests/stdlib/80-qsort.c b/lib/tests/stdlib/80-qsort.c
index aab1dc7ae208049263df413bf36184bb4f0e0240..1cc0f4e81f628f86f258970843f492dd4b0860b3 100644 (file)
--- a/lib/tests/stdlib/80-qsort.c
+++ b/lib/tests/stdlib/80-qsort.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <string.h>
 

diff --git a/lib/tests/stdlib/90-strtol.c b/lib/tests/stdlib/90-strtol.c
index 3dcdd6a0a321218b31e3b3c10754e737712366dc..c1fefc6828f12a6b8f58014074a16e0374dca024 100644 (file)
--- a/lib/tests/stdlib/90-strtol.c
+++ b/lib/tests/stdlib/90-strtol.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdlib.h>
 
 int

diff --git a/lib/tests/string/30-strlen.c b/lib/tests/string/30-strlen.c
index da3b7a09201b93a4bf17f795cc79dc91c29d9619..09f798afb5ea522af66ca5ef27eddca6d817ed87 100644 (file)
--- a/lib/tests/string/30-strlen.c
+++ b/lib/tests/string/30-strlen.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 int
 main ()

diff --git a/lib/tests/string/50-strcmp.c b/lib/tests/string/50-strcmp.c
index 0d464f3c8988c56f9c6f72c53acf93135e21fe5b..2240a006d4dce2a3707dc2e6b9823035fe41adc5 100644 (file)
--- a/lib/tests/string/50-strcmp.c
+++ b/lib/tests/string/50-strcmp.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <string.h>
 

diff --git a/lib/tests/string/50-strcpy.c b/lib/tests/string/50-strcpy.c
index 44fb1a5324b621a98191a17ad9d84039f502e098..8f1a02c8f63d88c52cd86b10dee21b1a397581e9 100644 (file)
--- a/lib/tests/string/50-strcpy.c
+++ b/lib/tests/string/50-strcpy.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <string.h>
 
 int

diff --git a/lib/tests/string/50-strncmp.c b/lib/tests/string/50-strncmp.c
index 37cbe949c4c6b6954edf7ed0de2a1dd636d69517..3fac20cc5914e194ba175ee56ded0896cde648c7 100644 (file)
--- a/lib/tests/string/50-strncmp.c
+++ b/lib/tests/string/50-strncmp.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <string.h>
 
 int

diff --git a/lib/tests/string/70-strchr.c b/lib/tests/string/70-strchr.c
index 708f62c602826c73860553511fb8e4a07503282a..5275e5334c3dc758d022a11a299dec381ebd2fa0 100644 (file)
--- a/lib/tests/string/70-strchr.c
+++ b/lib/tests/string/70-strchr.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <string.h>
 
 #define strchr xstrchr

diff --git a/lib/tests/string/80-strncpy.c b/lib/tests/string/80-strncpy.c
index ccccecf5a112dcced16d1440305f712dad9d9338..28ad9fa4561f0e623a369959d0cd3b6e3b766227 100644 (file)
--- a/lib/tests/string/80-strncpy.c
+++ b/lib/tests/string/80-strncpy.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 #include <string.h>
 

diff --git a/lib/tests/string/90-snprintf.c b/lib/tests/string/90-snprintf.c
index 4a5523454fdaceab900d59ad6b6c04ce2a36706a..54410d147fd515d54067cfa99da4e9022fa51324 100644 (file)
--- a/lib/tests/string/90-snprintf.c
+++ b/lib/tests/string/90-snprintf.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/scaffold/argv.c b/scaffold/argv.c
index 3abee39c4058b5d71cee7e24fec1e3a85f4dfdc7..43437a522a5b49c5d30192894815214985efb1bd 100644 (file)
--- a/scaffold/argv.c
+++ b/scaffold/argv.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <string.h>
 
 int

diff --git a/scaffold/cons-mes.c b/scaffold/cons-mes.c
index 41b3506d8a2bdaa1f512ea2f18a81ea286998fc7..59532cdb5eddd922cc22c7b058c3d38435fb9826 100644 (file)
--- a/scaffold/cons-mes.c
+++ b/scaffold/cons-mes.c
@@ -26,7 +26,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libmes.h>
+#include <mes/lib.h>
 
 char arena[2000];
 

diff --git a/scaffold/lib/stdlib/malloc.c b/scaffold/lib/stdlib/malloc.c
index b3f26128d0964fb9e35b6f58f87bc94404256dbe..b3fc3966251cfac89bfb3cc367e41ba392ea2bae 100644 (file)
--- a/scaffold/lib/stdlib/malloc.c
+++ b/scaffold/lib/stdlib/malloc.c
@@ -22,7 +22,7 @@
 #error "WITH_GLIBC not supported"
 #endif
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/scaffold/tests/17-compare-assign.c b/scaffold/tests/17-compare-assign.c
index e36fbb664f945080d59b6dc6e6e0d962a742db33..a0e8a8fdf5f14d89d1f2cffe6c87be552e76e8e0 100644 (file)
--- a/scaffold/tests/17-compare-assign.c
+++ b/scaffold/tests/17-compare-assign.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 test (int i)

diff --git a/scaffold/tests/17-compare-call.c b/scaffold/tests/17-compare-call.c
index 050d30b26202b0089a223622c99c326de4e0bec5..c56e73843aa15d7a90fac94f5b39034d08dcbb81 100644 (file)
--- a/scaffold/tests/17-compare-call.c
+++ b/scaffold/tests/17-compare-call.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 test (int i)

diff --git a/scaffold/tests/18-assign-shadow.c b/scaffold/tests/18-assign-shadow.c
index 58f46bf8e3cae8f423d12e6724c42089a2e6ab14..c778ca0ad71600edaf09b3973947d9ae1eb6ce60 100644 (file)
--- a/scaffold/tests/18-assign-shadow.c
+++ b/scaffold/tests/18-assign-shadow.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 main ()

diff --git a/scaffold/tests/23-pointer-sub.c b/scaffold/tests/23-pointer-sub.c
index 9c9ff1081e040993bf302b336d7af6c02b410c78..996f7414e7831f6ac43b2f4b29b5ef3abb861801 100644 (file)
--- a/scaffold/tests/23-pointer-sub.c
+++ b/scaffold/tests/23-pointer-sub.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 main ()

diff --git a/scaffold/tests/32-call-wrap.c b/scaffold/tests/32-call-wrap.c
index f0755cddd7201a3181da6c3d0aa8c778e15bf23b..0aa4603c3ad3ff89b9e8fcb354197dea9ac9d9c9 100644 (file)
--- a/scaffold/tests/32-call-wrap.c
+++ b/scaffold/tests/32-call-wrap.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 long
 wrap (long a)

diff --git a/scaffold/tests/32-compare.c b/scaffold/tests/32-compare.c
index 8cb3e5fe439ab6c6b43eddb3ca6ca836ba851cb1..9644cdf6b6263f7146b6bc6ba4cb7cab21bd5914 100644 (file)
--- a/scaffold/tests/32-compare.c
+++ b/scaffold/tests/32-compare.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 int
 isid (char c)

diff --git a/scaffold/tests/33-and-or.c b/scaffold/tests/33-and-or.c
index 4c3df22f44bf6428121cfa29b277d3a2aee7298f..8f90f05bade5b02cc45e081721aaf73c43e2df69 100644 (file)
--- a/scaffold/tests/33-and-or.c
+++ b/scaffold/tests/33-and-or.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 int
 main ()

diff --git a/scaffold/tests/34-pre-post.c b/scaffold/tests/34-pre-post.c
index dcb5260814c6151adda8cca53acd3648dae78087..6e17654b9d1a83cffd0dc81e60d09777d28d67b8 100644 (file)
--- a/scaffold/tests/34-pre-post.c
+++ b/scaffold/tests/34-pre-post.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 int
 main ()

diff --git a/scaffold/tests/35-compare-char.c b/scaffold/tests/35-compare-char.c
index d28ad4c84bceb6c3c399c5b828513ffeb264f2b4..04f24e7e796e1754172108fbf4803fc9d32d87fd 100644 (file)
--- a/scaffold/tests/35-compare-char.c
+++ b/scaffold/tests/35-compare-char.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 char g_arena[10];
 char *g_chars = g_arena;

diff --git a/scaffold/tests/36-compare-arithmetic.c b/scaffold/tests/36-compare-arithmetic.c
index d9ad96f83cd2f045877f8de5cd6c36ca64abd0f0..c54ff695b4f0f6006357648582663dc605709337 100644 (file)
--- a/scaffold/tests/36-compare-arithmetic.c
+++ b/scaffold/tests/36-compare-arithmetic.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 int
 main ()

diff --git a/scaffold/tests/37-compare-assign.c b/scaffold/tests/37-compare-assign.c
index a09a365b333bc9c66e05eece729b230b11b4a0f2..f9c15f297732d3c39109754381bca9ee385cb4de 100644 (file)
--- a/scaffold/tests/37-compare-assign.c
+++ b/scaffold/tests/37-compare-assign.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 int
 main ()

diff --git a/scaffold/tests/38-compare-call-2.c b/scaffold/tests/38-compare-call-2.c
index 6e0f48f8fe0d4d40c81f173b51df6b210fa86e1e..7368449b04a6fe8c40e9a6c73bba7289c3c81a24 100644 (file)
--- a/scaffold/tests/38-compare-call-2.c
+++ b/scaffold/tests/38-compare-call-2.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 int
 add (int a, int b)

diff --git a/scaffold/tests/38-compare-call-3.c b/scaffold/tests/38-compare-call-3.c
index 026a5e8b404ec003e01a148628bb621b5bb30ffd..01cd5b33e8cbf9cb3d50a956d0cf80fbffa26037 100644 (file)
--- a/scaffold/tests/38-compare-call-3.c
+++ b/scaffold/tests/38-compare-call-3.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 int
 add (int a, int b)

diff --git a/scaffold/tests/38-compare-call.c b/scaffold/tests/38-compare-call.c
index 1ec1aceec610f2d00686071c407318138b2ba79b..174b876a7190e857bf660e2561e417000f547f8c 100644 (file)
--- a/scaffold/tests/38-compare-call.c
+++ b/scaffold/tests/38-compare-call.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 enum type_t {TCHAR, TCLOSURE, TCONTINUATION, TFUNCTION, TKEYWORD, TMACRO, TNUMBER, TPAIR, TREF, TSPECIAL, TSTRING, TSYMBOL, TVALUES, TVECTOR, TBROKEN_HEART};
 

diff --git a/scaffold/tests/40-if-else.c b/scaffold/tests/40-if-else.c
index a55940d9622e06a39150d02535193dd53813e6b5..ba09d45e6c83f7e252db9e70749a161c8118c0ac 100644 (file)
--- a/scaffold/tests/40-if-else.c
+++ b/scaffold/tests/40-if-else.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 int
 main ()

diff --git a/scaffold/tests/41-ternary.c b/scaffold/tests/41-ternary.c
index df451b413717032778d61c42ff804673af0cbd4f..9105357013dc494c7b9760152111533230a3e446 100644 (file)
--- a/scaffold/tests/41-ternary.c
+++ b/scaffold/tests/41-ternary.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 int
 main ()

diff --git a/scaffold/tests/42-goto-label.c b/scaffold/tests/42-goto-label.c
index b660184cfae102492b79309d428c3d22dd0b0cf9..75c3297f1fb01e90dc2f6ccd0ffe806cf9002ef8 100644 (file)
--- a/scaffold/tests/42-goto-label.c
+++ b/scaffold/tests/42-goto-label.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 int
 label (int c)

diff --git a/scaffold/tests/43-for-do-while.c b/scaffold/tests/43-for-do-while.c
index 36db0af833a7a6982e3035693d14c28f92218128..81a626610e51703b23e0ab72216594a2c62b5fff 100644 (file)
--- a/scaffold/tests/43-for-do-while.c
+++ b/scaffold/tests/43-for-do-while.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 int
 main ()

diff --git a/scaffold/tests/44-switch-body-fallthrough.c b/scaffold/tests/44-switch-body-fallthrough.c
index 13b609f29512f83b428e98cf66d8c5de75aba302..affa844b12080e7468925c5631d5e3bfaa7cd154 100644 (file)
--- a/scaffold/tests/44-switch-body-fallthrough.c
+++ b/scaffold/tests/44-switch-body-fallthrough.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 main ()

diff --git a/scaffold/tests/44-switch-fallthrough.c b/scaffold/tests/44-switch-fallthrough.c
index c3c7b0515a35fd8405cea7c768753028e3a5497a..5ac83ff78e224a59d0f7bf56b3bab734e1a2452d 100644 (file)
--- a/scaffold/tests/44-switch-fallthrough.c
+++ b/scaffold/tests/44-switch-fallthrough.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 main ()

diff --git a/scaffold/tests/44-switch.c b/scaffold/tests/44-switch.c
index ad867b75a3fdd30e90855618ad963df87f711e5d..6f238d8db02acc97952815a5d571fc2e081a5ebb 100644 (file)
--- a/scaffold/tests/44-switch.c
+++ b/scaffold/tests/44-switch.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 enum type_t {TCHAR, TCLOSURE, TCONTINUATION, TFUNCTION, TKEYWORD, TMACRO, TNUMBER, TPAIR, TREF, TSPECIAL, TSTRING, TSYMBOL, TVALUES, TVECTOR, TBROKEN_HEART};
 

diff --git a/scaffold/tests/45-void-call.c b/scaffold/tests/45-void-call.c
index ea0a66de6ec08337e8cac194a6db98c2f9d21a68..515bf9a829797133bacd2c6cc09abd6bbc86b122 100644 (file)
--- a/scaffold/tests/45-void-call.c
+++ b/scaffold/tests/45-void-call.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 void
 void_func ()

diff --git a/scaffold/tests/51-pointer-sub.c b/scaffold/tests/51-pointer-sub.c
index d02f20286c0bc26cc5afca933a6cda6b6030a42b..c289d2393a8f68b2b047fa84fbf94f7241ab202f 100644 (file)
--- a/scaffold/tests/51-pointer-sub.c
+++ b/scaffold/tests/51-pointer-sub.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 main ()

diff --git a/scaffold/tests/54-argc.c b/scaffold/tests/54-argc.c
index a6d5865413dd1ac1d0d5a36eff2b8b4a8c2dd2ce..3388a02e1fdb67ce1a4895e5a50e459c7975209b 100644 (file)
--- a/scaffold/tests/54-argc.c
+++ b/scaffold/tests/54-argc.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/scaffold/tests/54-argv.c b/scaffold/tests/54-argv.c
index 5af208a778c83843db456b9f1f8ba7d7466d57a0..cdabdc39e553251700432407d6a5299488588adf 100644 (file)
--- a/scaffold/tests/54-argv.c
+++ b/scaffold/tests/54-argv.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/scaffold/tests/60-math.c b/scaffold/tests/60-math.c
index 0779c4ec6ce385176b62ebcbed00ea7041c3a429..dd06370c9031695cccc02609ce63e55e4434d0a2 100644 (file)
--- a/scaffold/tests/60-math.c
+++ b/scaffold/tests/60-math.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 add (int a, int b)

diff --git a/scaffold/tests/61-array.c b/scaffold/tests/61-array.c
index 6f024ab6b8b2fea79327b0516931fb9d4925fa8c..754393f9700e96dcb1e750d2fa413c43d7467791 100644 (file)
--- a/scaffold/tests/61-array.c
+++ b/scaffold/tests/61-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/scaffold/tests/63-struct-array-assign.c b/scaffold/tests/63-struct-array-assign.c
index a226e9097d076401ef5b12740d1cab7e6608e1ee..093c2a67b7da9e68d088bf5886c38b68bf90cf45 100644 (file)
--- a/scaffold/tests/63-struct-array-assign.c
+++ b/scaffold/tests/63-struct-array-assign.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct scm
 {

diff --git a/scaffold/tests/63-struct-array-compare.c b/scaffold/tests/63-struct-array-compare.c
index d875a383eef8eba9f64798c39175f8e85ae4d233..d0db546c8642f0adcc7ad2c088eecde2344f307d 100644 (file)
--- a/scaffold/tests/63-struct-array-compare.c
+++ b/scaffold/tests/63-struct-array-compare.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct scm
 {

diff --git a/scaffold/tests/63-struct-array.c b/scaffold/tests/63-struct-array.c
index 079e70a3ffdec726bf3e46b18d7f1fbbf908087b..eb6aecd531a8a2dcb4408c271c707701b677d65b 100644 (file)
--- a/scaffold/tests/63-struct-array.c
+++ b/scaffold/tests/63-struct-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct scm
 {

diff --git a/scaffold/tests/63-struct-assign.c b/scaffold/tests/63-struct-assign.c
index 30067d286101fdc136237233b948ad8ef3eac045..6c17d7068636931c017db880e48dbfbc95fa1f35 100644 (file)
--- a/scaffold/tests/63-struct-assign.c
+++ b/scaffold/tests/63-struct-assign.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct scm
 {

diff --git a/scaffold/tests/63-struct-cell.c b/scaffold/tests/63-struct-cell.c
index 7bd36913409d46684c95449708bb3912a4ad51a5..2b5a30049741921cc880f4a2f8abd7a89b755c2a 100644 (file)
--- a/scaffold/tests/63-struct-cell.c
+++ b/scaffold/tests/63-struct-cell.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/scaffold/tests/63-struct-function.c b/scaffold/tests/63-struct-function.c
index 783924baa27ac1f48b88a02fbbfef5773ee4ee90..1e0d65245aa9974107c568809d902b7b771cc7c5 100644 (file)
--- a/scaffold/tests/63-struct-function.c
+++ b/scaffold/tests/63-struct-function.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdlib.h>
 
 struct function

diff --git a/scaffold/tests/63-struct-local.c b/scaffold/tests/63-struct-local.c
index 88ea62497e638968eb82e8c4d9cca146b64fb50e..52c8a14cc5a7de6591269599a0f95a13f871c86a 100644 (file)
--- a/scaffold/tests/63-struct-local.c
+++ b/scaffold/tests/63-struct-local.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct scm
 {

diff --git a/scaffold/tests/63-struct-pointer.c b/scaffold/tests/63-struct-pointer.c
index d25be3478a548671cdf7ff4d4b4be4959d6c67e9..8e9115ec63fbecaf56ae44ab1cf6bea32ce5e8e1 100644 (file)
--- a/scaffold/tests/63-struct-pointer.c
+++ b/scaffold/tests/63-struct-pointer.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct scm
 {

diff --git a/scaffold/tests/63-struct.c b/scaffold/tests/63-struct.c
index df76d544daba896f967c08b7219784d420eb644f..2b3392370b39a3fb1eeffcc54c41ccd17b92bc46 100644 (file)
--- a/scaffold/tests/63-struct.c
+++ b/scaffold/tests/63-struct.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct scm
 {

diff --git a/scaffold/tests/64-make-cell.c b/scaffold/tests/64-make-cell.c
index 5d00686379626ee92e5910756ff566d935bb35f5..5845c98d3707473ad919c450d1da4dcf8ceb4465 100644 (file)
--- a/scaffold/tests/64-make-cell.c
+++ b/scaffold/tests/64-make-cell.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/scaffold/tests/65-read.c b/scaffold/tests/65-read.c
index 4574321fa9ffe53ba47f6de44335393ee785885e..a492fa1eaeec3fe03abd4fdb43e22ea154ee792b 100644 (file)
--- a/scaffold/tests/65-read.c
+++ b/scaffold/tests/65-read.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/scaffold/tests/66-local-char-array.c b/scaffold/tests/66-local-char-array.c
index ad4153ec5a46686f4d9b2f1d46a023933c0e6d48..71d26db2bde62888b0e676a3b52b158d61dece96 100644 (file)
--- a/scaffold/tests/66-local-char-array.c
+++ b/scaffold/tests/66-local-char-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/scaffold/tests/70-stdarg.c b/scaffold/tests/70-stdarg.c
index 316efaca9149ad5baac96ebc1a402e373bd883fc..3c2c9ff078843b3337d949e694b81e6d63d451e2 100644 (file)
--- a/scaffold/tests/70-stdarg.c
+++ b/scaffold/tests/70-stdarg.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdarg.h>
 
 int

diff --git a/scaffold/tests/71-struct-array.c b/scaffold/tests/71-struct-array.c
index dc7c8837ef362d2055a622037d18c9305d83b760..cedabb34506f5d5c841acc5e6af281caf70cf50e 100644 (file)
--- a/scaffold/tests/71-struct-array.c
+++ b/scaffold/tests/71-struct-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 #include <string.h>
 

diff --git a/scaffold/tests/72-typedef-struct-def.c b/scaffold/tests/72-typedef-struct-def.c
index f6a29210767febfbb3fe696549d77819aaa88946..dd46f0a083886bdef3098cc9e7e646bff0b0dd3f 100644 (file)
--- a/scaffold/tests/72-typedef-struct-def.c
+++ b/scaffold/tests/72-typedef-struct-def.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 
 typedef struct foo

diff --git a/scaffold/tests/73-union-hello.c b/scaffold/tests/73-union-hello.c
index 05fee0cee1c470f4531f56d512078a58dc7582fb..19205f0cec7f309f1073d28b3ed4625918867bd8 100644 (file)
--- a/scaffold/tests/73-union-hello.c
+++ b/scaffold/tests/73-union-hello.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 typedef union foo
 {

diff --git a/scaffold/tests/73-union.c b/scaffold/tests/73-union.c
index 02dcfe3786554cd3709b3c2ea2385e6b95ec3675..3c4464888528e5158bf1f3a9ccbdae363beb2db0 100644 (file)
--- a/scaffold/tests/73-union.c
+++ b/scaffold/tests/73-union.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 
 typedef union foo

diff --git a/scaffold/tests/74-multi-line-string.c b/scaffold/tests/74-multi-line-string.c
index 951342dbd95dd861987534a95d59a9b150d86ed6..ba2bfa82498840ddcee4d56443608ebd9c728f0f 100644 (file)
--- a/scaffold/tests/74-multi-line-string.c
+++ b/scaffold/tests/74-multi-line-string.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 #include <string.h>
 

diff --git a/scaffold/tests/75-struct-union.c b/scaffold/tests/75-struct-union.c
index ae146745aeb76e249337720c53eba27415a51235..08f89399398a7e4cbf96d09742355f02cc1936b3 100644 (file)
--- a/scaffold/tests/75-struct-union.c
+++ b/scaffold/tests/75-struct-union.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 
 union u {

diff --git a/scaffold/tests/76-pointer-arithmetic-pp.c b/scaffold/tests/76-pointer-arithmetic-pp.c
index aa7b11db7944fef258855ce20d8b784b722c3b91..57978762e5b132202b9eb8a73099830196f9603e 100644 (file)
--- a/scaffold/tests/76-pointer-arithmetic-pp.c
+++ b/scaffold/tests/76-pointer-arithmetic-pp.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #define ptr_size sizeof (void*)
 

diff --git a/scaffold/tests/76-pointer-arithmetic.c b/scaffold/tests/76-pointer-arithmetic.c
index 50769a1f9b6edf8ef4d8705461848f0a9ada1f90..d76c494e1b8d80256360a7020dfdb248b4725ab7 100644 (file)
--- a/scaffold/tests/76-pointer-arithmetic.c
+++ b/scaffold/tests/76-pointer-arithmetic.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 
 char *list[2] = {"foo\n", "bar\n"};

diff --git a/scaffold/tests/77-pointer-assign.c b/scaffold/tests/77-pointer-assign.c
index 053f3c37e4bde8381054ef9c479fe8b0ad5f5e1e..ad9a6008180cbe4c084ebf8b8ef195f44632998e 100644 (file)
--- a/scaffold/tests/77-pointer-assign.c
+++ b/scaffold/tests/77-pointer-assign.c
@@ -20,7 +20,7 @@
 
 #include <string.h>
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct baz {
   int i;

diff --git a/scaffold/tests/78-union-struct.c b/scaffold/tests/78-union-struct.c
index 3dcbb5bce80158de1cc936a392ca34d0982a0cc1..cd623b21fcf7230bfdd30b2aa3038eb05a4a3b90 100644 (file)
--- a/scaffold/tests/78-union-struct.c
+++ b/scaffold/tests/78-union-struct.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdint.h>
 

diff --git a/scaffold/tests/79-int-array-simple.c b/scaffold/tests/79-int-array-simple.c
index 9f0bd23ec36ac82cfffb13281d3fdcb660458c31..a0579283d8176359f3179045c863ec74d458b9cd 100644 (file)
--- a/scaffold/tests/79-int-array-simple.c
+++ b/scaffold/tests/79-int-array-simple.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int bla[2] = {0,-1};
 

diff --git a/scaffold/tests/79-int-array.c b/scaffold/tests/79-int-array.c
index 4fdd6fa7dbc005ac1e58dbc2dc32ae3c92b35860..bb696092f705a39cf7dff4d3a930b03dec88c3e5 100644 (file)
--- a/scaffold/tests/79-int-array.c
+++ b/scaffold/tests/79-int-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/scaffold/tests/7a-struct-char-array.c b/scaffold/tests/7a-struct-char-array.c
index 9c37f290629f6c7e321efbfed92b215b108f937d..6bea556f9f2294205ab8d2c57530afa3b713b529 100644 (file)
--- a/scaffold/tests/7a-struct-char-array.c
+++ b/scaffold/tests/7a-struct-char-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 #include <string.h>
 

diff --git a/scaffold/tests/7b-struct-int-array-hello.c b/scaffold/tests/7b-struct-int-array-hello.c
index f841e6ebd4780a69b7c657162c41e7c4b7f6ef5e..9ea1d444b21c6be874e7df4f6f6c5c18600ae83d 100644 (file)
--- a/scaffold/tests/7b-struct-int-array-hello.c
+++ b/scaffold/tests/7b-struct-int-array-hello.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct foo
 {

diff --git a/scaffold/tests/7b-struct-int-array-pointer.c b/scaffold/tests/7b-struct-int-array-pointer.c
index 2a2c6cf05061b8c1b5b8ba05eb0a71140ed7216f..0b7707114ae35140908f4723ed49d1f3ce609325 100644 (file)
--- a/scaffold/tests/7b-struct-int-array-pointer.c
+++ b/scaffold/tests/7b-struct-int-array-pointer.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct bar
 {

diff --git a/scaffold/tests/7b-struct-int-array.c b/scaffold/tests/7b-struct-int-array.c
index dde928727030be62976316bd7779ef1649a7fc95..bf8b66edee51ae559a5543075d1d5d3b52a63763 100644 (file)
--- a/scaffold/tests/7b-struct-int-array.c
+++ b/scaffold/tests/7b-struct-int-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct foo
 {

diff --git a/scaffold/tests/7c-dynarray.c b/scaffold/tests/7c-dynarray.c
index 26a250d794ee8bd5bb6b3cda82405ff5d6518997..a6406526126e7ae142be6f4c417b520d7d513b8a 100644 (file)
--- a/scaffold/tests/7c-dynarray.c
+++ b/scaffold/tests/7c-dynarray.c
@@ -18,9 +18,9 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/scaffold/tests/7d-cast-char.c b/scaffold/tests/7d-cast-char.c
index e3062c0388486a8a4f6d0e281eda6352586fab37..b7ae799f04fb08f8c03aebaa35f39e1417816259 100644 (file)
--- a/scaffold/tests/7d-cast-char.c
+++ b/scaffold/tests/7d-cast-char.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 main ()

diff --git a/scaffold/tests/7e-struct-array-access.c b/scaffold/tests/7e-struct-array-access.c
index f54be651cfa1fb534b325d4dfb14e54929a0254e..418624396550196a87a5b60dd9b3394834e5ab97 100644 (file)
--- a/scaffold/tests/7e-struct-array-access.c
+++ b/scaffold/tests/7e-struct-array-access.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/scaffold/tests/7f-struct-pointer-arithmetic.c b/scaffold/tests/7f-struct-pointer-arithmetic.c
index 8738ed4a033656d12e3dce1225e0ef90e307cbdd..6ddd9549bea89d53434f15514b552d1a130820b0 100644 (file)
--- a/scaffold/tests/7f-struct-pointer-arithmetic.c
+++ b/scaffold/tests/7f-struct-pointer-arithmetic.c
@@ -18,9 +18,9 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdio.h>
 
 struct foo;

diff --git a/scaffold/tests/7g-struct-byte-word-field.c b/scaffold/tests/7g-struct-byte-word-field.c
index de854e40b3510436d032a3b25d8f9c196b0a364e..6336a2bdfd772405fce8da3341a12210843ef31b 100644 (file)
--- a/scaffold/tests/7g-struct-byte-word-field.c
+++ b/scaffold/tests/7g-struct-byte-word-field.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <inttypes.h>
 #include <string.h>

diff --git a/scaffold/tests/7h-struct-assign.c b/scaffold/tests/7h-struct-assign.c
index 5cb51db472d7e64a34da7f137c5c44bfeaee6ac0..03f131629a7bbe32823121f268c520ca405411b9 100644 (file)
--- a/scaffold/tests/7h-struct-assign.c
+++ b/scaffold/tests/7h-struct-assign.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <string.h>
 
 struct string {

diff --git a/scaffold/tests/7i-struct-struct-simple.c b/scaffold/tests/7i-struct-struct-simple.c
index e5abba7d117be33ac1d1b3d0b3a093ecb9d06e43..a4a46af06f838a7cd268dd085613619cba71ffbb 100644 (file)
--- a/scaffold/tests/7i-struct-struct-simple.c
+++ b/scaffold/tests/7i-struct-struct-simple.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 

diff --git a/scaffold/tests/7i-struct-struct.c b/scaffold/tests/7i-struct-struct.c
index 4c573a14d230184897cda11c8783675a88dd20ec..005186661af9fc1a61aaad69b8b23915db7ab42f 100644 (file)
--- a/scaffold/tests/7i-struct-struct.c
+++ b/scaffold/tests/7i-struct-struct.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <stdio.h>
 

diff --git a/scaffold/tests/7k-for-each-elem-simple.c b/scaffold/tests/7k-for-each-elem-simple.c
index dbc3b05392aa8c9b0c9c4253a3013b98f3af9970..7f0e3c1b34eb8bedb513e700252ea2c2bc2b3135 100644 (file)
--- a/scaffold/tests/7k-for-each-elem-simple.c
+++ b/scaffold/tests/7k-for-each-elem-simple.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <string.h>
 #include <stdio.h>

diff --git a/scaffold/tests/7k-for-each-elem.c b/scaffold/tests/7k-for-each-elem.c
index 14c5cf96a83525b2516ef751554fbdf0d6d82fb0..c963fcb358cf1483e93b1032fa06d0ba4a6f8ad1 100644 (file)
--- a/scaffold/tests/7k-for-each-elem.c
+++ b/scaffold/tests/7k-for-each-elem.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct section
 {

diff --git a/scaffold/tests/7l-struct-any-size-array-simple.c b/scaffold/tests/7l-struct-any-size-array-simple.c
index c1636ad1dffb8725804bdfeeee5153bd1a72c32f..cbfab19aaced18dd730594ea2ee3e249c1705213 100644 (file)
--- a/scaffold/tests/7l-struct-any-size-array-simple.c
+++ b/scaffold/tests/7l-struct-any-size-array-simple.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #if __MESC__
 #define  __attribute__(x)

diff --git a/scaffold/tests/7l-struct-any-size-array.c b/scaffold/tests/7l-struct-any-size-array.c
index 49da14840f18543adfcea0cf58561ec12e5dc805..9c48f07797ad647c90ba7257a25b89dea84fd148 100644 (file)
--- a/scaffold/tests/7l-struct-any-size-array.c
+++ b/scaffold/tests/7l-struct-any-size-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #if __MESC__
 #define  __attribute__(x)

diff --git a/scaffold/tests/7m-struct-char-array-assign.c b/scaffold/tests/7m-struct-char-array-assign.c
index f7865179f6a0badd36ea10be2686a58cd2ab5678..29247904395f063b1b7307d4f135ad9aba417ae0 100644 (file)
--- a/scaffold/tests/7m-struct-char-array-assign.c
+++ b/scaffold/tests/7m-struct-char-array-assign.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct file {
   char *ptr;

diff --git a/scaffold/tests/7n-struct-struct-array.c b/scaffold/tests/7n-struct-struct-array.c
index b56751cf70fb5fa2ed58909f8e5193c0e0c94354..d2f3444a46960091b6c99a8dcb11b07cb69f8e86 100644 (file)
--- a/scaffold/tests/7n-struct-struct-array.c
+++ b/scaffold/tests/7n-struct-struct-array.c
@@ -18,9 +18,9 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
-#include <libmes.h>
+#include <mes/lib.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/scaffold/tests/7o-struct-pre-post-simple.c b/scaffold/tests/7o-struct-pre-post-simple.c
index ec0e26d44f10dc8f676f074a67733e1e61db4caf..e93b930f2e42c482afaba8751d18e8eda3c54b8d 100644 (file)
--- a/scaffold/tests/7o-struct-pre-post-simple.c
+++ b/scaffold/tests/7o-struct-pre-post-simple.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct info {int flag;};
 struct foo {int length; char* string; struct info info;};

diff --git a/scaffold/tests/7o-struct-pre-post.c b/scaffold/tests/7o-struct-pre-post.c
index 69ab0fab368c6b11416b9950ad554c0c6857873f..68a8e464ca628678da26fadcf05245dc903dea10 100644 (file)
--- a/scaffold/tests/7o-struct-pre-post.c
+++ b/scaffold/tests/7o-struct-pre-post.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct info {int flag;};
 struct foo {int length; char* string; struct info info;};

diff --git a/scaffold/tests/7u-call-ternary.c b/scaffold/tests/7u-call-ternary.c
index 4915cfe83135346e9065212661d0e9c649f83acb..7a7257241d961b3ca5da147800e911f984b67888 100644 (file)
--- a/scaffold/tests/7u-call-ternary.c
+++ b/scaffold/tests/7u-call-ternary.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 test (int i)

diff --git a/scaffold/tests/7u-inc-byte-word.c b/scaffold/tests/7u-inc-byte-word.c
index 3ef9a297369f7edbd73c50b4afe266702e1ad9ae..93b09baa372e86fb2e50ea4b66bb230cfb1c041c 100644 (file)
--- a/scaffold/tests/7u-inc-byte-word.c
+++ b/scaffold/tests/7u-inc-byte-word.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 main ()

diff --git a/scaffold/tests/7u-struct-size10.c b/scaffold/tests/7u-struct-size10.c
index 70bf77b64a17ec400dcedefc1521734ae8680945..bb011115f9a4a9d4bf9d70c4d7aea25806f5b1d7 100644 (file)
--- a/scaffold/tests/7u-struct-size10.c
+++ b/scaffold/tests/7u-struct-size10.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct foo
 {

diff --git a/scaffold/tests/7u-ternary-expression.c b/scaffold/tests/7u-ternary-expression.c
index a4b5f894a258f5964ce220dc4d54dd34bd0ad183..8f6acd6a8265f008baabf1243c2ae65d52db838e 100644 (file)
--- a/scaffold/tests/7u-ternary-expression.c
+++ b/scaffold/tests/7u-ternary-expression.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 int
 main ()

diff --git a/scaffold/tests/7u-vstack.c b/scaffold/tests/7u-vstack.c
index 52563515729366b9ae260755f815a8db1ac764fa..fe3452881dd99c582fd89c728164664586db0900 100644 (file)
--- a/scaffold/tests/7u-vstack.c
+++ b/scaffold/tests/7u-vstack.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 struct foo
 {

diff --git a/scaffold/tests/a0-call-trunc-char.c b/scaffold/tests/a0-call-trunc-char.c
index 7369513cb92dd664c45a474d978c91b1fb7a93e0..e00172c5cd494f1a1f4d2e8a7a6ead0caa1247f1 100644 (file)
--- a/scaffold/tests/a0-call-trunc-char.c
+++ b/scaffold/tests/a0-call-trunc-char.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 f (unsigned char x)

diff --git a/scaffold/tests/a0-call-trunc-int.c b/scaffold/tests/a0-call-trunc-int.c
index d49b385a5c25c6c4c5fe8d9d9ee5394fdd307ce7..b21dd0f9b4cdac60d1c67768c520d02f331421cd 100644 (file)
--- a/scaffold/tests/a0-call-trunc-int.c
+++ b/scaffold/tests/a0-call-trunc-int.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 long
 f (unsigned int x)

diff --git a/scaffold/tests/a0-call-trunc-short.c b/scaffold/tests/a0-call-trunc-short.c
index 37284af408a62e4b1882c13759e34d35aab04730..13755c907cccdbcc09c86f183fce567b2f88a434 100644 (file)
--- a/scaffold/tests/a0-call-trunc-short.c
+++ b/scaffold/tests/a0-call-trunc-short.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 int
 f (unsigned short x)

diff --git a/scaffold/tests/a1-global-no-align.c b/scaffold/tests/a1-global-no-align.c
index 1d40bf524302357d03cd0e3a3a44511ea3793c4f..89314db98821602fc7bc58f3ec8f951e2168da32 100644 (file)
--- a/scaffold/tests/a1-global-no-align.c
+++ b/scaffold/tests/a1-global-no-align.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 short foo;
 short bar;

diff --git a/scaffold/tests/a1-global-no-clobber.c b/scaffold/tests/a1-global-no-clobber.c
index 8e58981ee06cf6fe49bcec0a5e20c3dd2f3a7df7..b9a172b68a09262682f3310a47f9f47339edf826 100644 (file)
--- a/scaffold/tests/a1-global-no-clobber.c
+++ b/scaffold/tests/a1-global-no-clobber.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #if __i386__
 short foo;

diff --git a/scaffold/tiny-mes.c b/scaffold/tiny-mes.c
index 32c92bd4498714304452443c7ad63af5562411cc..fe3ac018417a87cfd00105e6d5767a9e0ad61e1a 100644 (file)
--- a/scaffold/tiny-mes.c
+++ b/scaffold/tiny-mes.c
@@ -22,7 +22,7 @@
 #error "WITH_GLIBC not supported"
 #endif
 
-#include <libmes.h>
+#include <mes/lib.h>
 
 #include <fcntl.h>
 #include <stdio.h>

diff --git a/src/mes.c b/src/mes.c
index 8349cdb4c2ae20fccc2e3973318e96f878c6bef1..52cd853199a0f73ff0ef377c12776a4bab396026 100644 (file)
--- a/src/mes.c
+++ b/src/mes.c
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libmes.h>
+#include <mes/lib.h>
 
 //#define MES_MINI 1
 #if WITH_GLIBC