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.

include/mes/lib-mini.h

@@ -18,8 +18,8 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __MES_LIBMES_MINI_H
+#ifndef __MES_LIB_MINI_H
-#define __MES_LIBMES_MINI_H
+#define __MES_LIB_MINI_H
 
 #if !WITH_GLIBC
 
@@ -85,7 +85,8 @@ 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_LIBMES_MINI_H
+#endif //__MES_LIB_MINI_H

include/mes/lib.h

@@ -18,10 +18,10 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __MES_LIBMES_H
+#ifndef __MES_LIB_H
-#define __MES_LIBMES_H
+#define __MES_LIB_H
 
-#include <libmes-mini.h>
+#include <mes/lib-mini.h>
 
 #if WITH_GLIBC
 int mes_open (char const *file_name, int flags, ...);
@@ -56,4 +56,4 @@ int oputc (int c);
 int oputs (char const* s);
 char *search_path (char const *file_name);
 
-#endif //__MES_LIBMES_H
+#endif //__MES_LIB_H

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

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)

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)

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)

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)

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>

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>

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)

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>

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

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

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[]);
 

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:

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:

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

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)

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)

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)

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>
 

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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

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

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__

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

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

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

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>

lib/stdio/vsnprintf.c

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

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>
 

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)

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);
 

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)

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

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)

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 ()

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)

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

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)

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

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

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)

lib/stub/fscanf.c

@@ -18,8 +18,8 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
-#include <stdio.h>
+#include <unistd.h>
 
 int
 fscanf (FILE *stream, char const *template, ...)

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 *

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 *

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 *

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>
 

lib/stub/ldexp.c

@@ -18,8 +18,8 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libmes.h>
+#include <mes/lib.h>
-#include <stdlib.h>
+#include <math.h>
 
 double
 ldexp (double x, int exp)

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>
 

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

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)

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)

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

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)

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)

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 *

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

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

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

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

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

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

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)

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,

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

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)

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)

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>
 

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 *

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)

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)

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>
 

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>

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>

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

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

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>