Merge branch 'devel' into 64-make-sure-that-the-mamba-headers-go-to-the-right-place

include/Makefile.am

@@ -93,6 +93,7 @@ noinst_HEADERS = \
 	maestro/i_pool.h       \
 	maestro/i_mempool.h    \
 	maestro/i_khash.h      \
+	maestro/i_ketopt.h     \
 	maestro/i_hashing.h    \
 	maestro/i_misc.h
 

include/maestro/i_ketopt.h

-/* taken from https://github.com/attractivechaos/klib/blob/master/ketopt.h */
-
-/* This file is originally part of klib, which is licensed under the
- * X11/MIT licnense: */
-
+/* ketopt.h from https://github.com/attractivechaos/klib/blob/master/ketopt.h */
+/* This is version  cc7e69f, dated Wed Nov 18 17:27:49 CET 2020 */
 /* The MIT License
-   Copyright (c) 2008, 2009, 2011 by Attractive Chaos <attractor@live.co.uk>
+   Copyright (c) 2008, by Attractive Chaos <attractor@live.co.uk>
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the
    "Software"), to deal in the Software without restriction, including
@@ -23,9 +20,8 @@
    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    SOFTWARE.
 */
-   
-#ifndef I_KETOPT_H
-#define I_KETOPT_H
+#ifndef KETOPT_H
+#define KETOPT_H
 
 #include <string.h> /* for strchr() and strncmp() */