/* -*-c-*-
*
- * $Id: alloc.h,v 1.3 1999/05/06 19:51:35 mdw Exp $
+ * $Id: alloc.h,v 1.4 1999/12/10 23:42:04 mdw Exp $
*
* Memory allocation functions
*
/*----- Revision history --------------------------------------------------*
*
* $Log: alloc.h,v $
+ * Revision 1.4 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.3 1999/05/06 19:51:35 mdw
* Reformatted the LGPL notice a little bit.
*
*
*/
-#ifndef ALLOC_H
-#define ALLOC_H
+#ifndef MLIB_ALLOC_H
+#define MLIB_ALLOC_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: base64.h,v 1.2 1999/05/18 21:45:27 mdw Exp $
+ * $Id: base64.h,v 1.3 1999/12/10 23:42:04 mdw Exp $
*
* Base64 encoding and decoding
*
/*----- Revision history --------------------------------------------------*
*
* $Log: base64.h,v $
+ * Revision 1.3 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.2 1999/05/18 21:45:27 mdw
* Allow Base64 encode and decode of arbitrary rubbish.
*
*
*/
-#ifndef BASE64_H
-#define BASE64_H
+#ifndef MLIB_BASE64_H
+#define MLIB_BASE64_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: bits.h,v 1.3 1999/06/20 23:31:52 mdw Exp $
+ * $Id: bits.h,v 1.4 1999/12/10 23:42:04 mdw Exp $
*
* Portable bit-level manipulation macros
*
/*----- Revision history --------------------------------------------------*
*
* $Log: bits.h,v $
+ * Revision 1.4 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.3 1999/06/20 23:31:52 mdw
* More portability enhancements.
*
*
*/
-#ifndef BITS_H
-#define BITS_H
+#ifndef MLIB_BITS_H
+#define MLIB_BITS_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: bres.h,v 1.2 1999/10/30 11:56:21 mdw Exp $
+ * $Id: bres.h,v 1.3 1999/12/10 23:42:04 mdw Exp $
*
* Background reverse name resolution
*
/*----- Revision history --------------------------------------------------*
*
* $Log: bres.h,v $
+ * Revision 1.3 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.2 1999/10/30 11:56:21 mdw
* Fix include error, pointed out by Chris Rutter.
*
*
*/
-#ifndef RES_H
-#define RES_H
+#ifndef MLIB_RES_H
+#define MLIB_RES_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: conn.h,v 1.4 1999/05/26 21:08:01 mdw Exp $
+ * $Id: conn.h,v 1.5 1999/12/10 23:42:04 mdw Exp $
*
* Nonblocking connect handling
*
/*----- Revision history --------------------------------------------------*
*
* $Log: conn.h,v $
+ * Revision 1.5 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.4 1999/05/26 21:08:01 mdw
* Remove redundant structure member.
*
*
*/
-#ifndef CONN_H
-#define CONN_H
+#ifndef MLIB_CONN_H
+#define MLIB_CONN_H
#ifdef __cplusplus
extern "C" {
#include <sys/types.h>
#include <sys/socket.h>
-#ifndef SEL_H
+#ifndef MLIB_SEL_H
# include "sel.h"
#endif
/* -*-c-*-
*
- * $Id: crc32.h,v 1.4 1999/06/01 09:47:22 mdw Exp $
+ * $Id: crc32.h,v 1.5 1999/12/10 23:42:04 mdw Exp $
*
* Calculating cyclic redundancy values (non-cryptographic!)
*
/*----- Revision history --------------------------------------------------*
*
* $Log: crc32.h,v $
+ * Revision 1.5 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.4 1999/06/01 09:47:22 mdw
* Make the return type of `crc32' a `uint32' now that we have `bits.h'.
*
*
*/
-#ifndef CRC32_H
+#ifndef MLIB_CRC32_H
#define CRC32_h
#ifdef __cplusplus
/*----- Header files ------------------------------------------------------*/
-#ifndef BITS_H
+#ifndef MLIB_BITS_H
# include "bits.h"
#endif
/* -*-c-*-
*
- * $Id: darray.h,v 1.3 1999/11/05 14:32:43 mdw Exp $
+ * $Id: darray.h,v 1.4 1999/12/10 23:42:04 mdw Exp $
*
* Dynamically growing dense arrays
*
/*----- Revision history --------------------------------------------------*
*
* $Log: darray.h,v $
+ * Revision 1.4 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.3 1999/11/05 14:32:43 mdw
* Minor change in argument naming.
*
*
*/
-#ifndef DARRAY_H
-#define DARRAY_H
+#ifndef MLIB_DARRAY_H
+#define MLIB_DARRAY_H
#ifdef __cplusplus
extern "C" {
#include <stdlib.h>
#include <string.h>
-#ifndef ALLOC_H
+#ifndef MLIB_ALLOC_H
# include "alloc.h"
#endif
-#ifndef EXC_H
+#ifndef MLIB_EXC_H
# include "exc.h"
#endif
/* -*-c-*-
*
- * $Id: dspool.h,v 1.1 1999/05/21 22:15:26 mdw Exp $
+ * $Id: dspool.h,v 1.2 1999/12/10 23:42:04 mdw Exp $
*
* Provide pools of strings
*
/*----- Revision history --------------------------------------------------*
*
* $Log: dspool.h,v $
+ * Revision 1.2 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.1 1999/05/21 22:15:26 mdw
* Dynamic string pool system, based on an idea from the `sw-tools'
* project. Could do with more work to make it really good.
*
*/
-#ifndef DSPOOL_H
-#define DSPOOL_H
+#ifndef MLIB_DSPOOL_H
+#define MLIB_DSPOOL_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: dstr.c,v 1.11 1999/10/28 22:05:29 mdw Exp $
+ * $Id: dstr.c,v 1.12 1999/12/10 23:42:04 mdw Exp $
*
* Handle dynamically growing strings
*
/*----- Revision history --------------------------------------------------*
*
* $Log: dstr.c,v $
+ * Revision 1.12 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.11 1999/10/28 22:05:29 mdw
* Modify and debug allocation routines.
*
/* --- @dstr_reset@ --- *
*
- * Arguments: @dstr *d@ = pointer to a dynaimc string block
+ * Arguments: @dstr *d@ = pointer to a dynamic string block
*
* Returns: ---
*
/* -*-c-*-
*
- * $Id: dstr.h,v 1.8 1999/07/14 19:45:24 mdw Exp $
+ * $Id: dstr.h,v 1.9 1999/12/10 23:42:04 mdw Exp $
*
* Handle dynamically growing strings
*
/*----- Revision history --------------------------------------------------*
*
* $Log: dstr.h,v $
+ * Revision 1.9 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.8 1999/07/14 19:45:24 mdw
* Prevent some macros from re-evaluating their arguments.
*
*
*/
-#ifndef DSTR_H
-#define DSTR_H
+#ifndef MLIB_DSTR_H
+#define MLIB_DSTR_H
#ifdef __cplusplus
extern "C" {
/* --- @dstr_reset@ --- *
*
- * Arguments: @dstr *d@ = pointer to a dynaimc string block
+ * Arguments: @dstr *d@ = pointer to a dynamic string block
*
* Returns: ---
*
/* -*-c-*-
*
- * $Id: env.h,v 1.1 1999/07/26 23:15:57 mdw Exp $
+ * $Id: env.h,v 1.2 1999/12/10 23:42:04 mdw Exp $
*
* Fiddling with environment variables
*
/*----- Revision history --------------------------------------------------*
*
* $Log: env.h,v $
+ * Revision 1.2 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.1 1999/07/26 23:15:57 mdw
* Fiddling with environment variables.
*
*/
-#ifndef ENV_H
-#define ENV_H
+#ifndef MLIB_ENV_H
+#define MLIB_ENV_H
#ifdef __cplusplus
extern "C" {
/*----- Header files ------------------------------------------------------*/
-#ifndef SYM_H
+#ifndef MLIB_SYM_H
# include "sym.h"
#endif
/* -*-c-*-
*
- * $Id: exc.h,v 1.4 1999/10/22 22:39:18 mdw Exp $
+ * $Id: exc.h,v 1.5 1999/12/10 23:42:04 mdw Exp $
*
* Structured exception handling in C
*
/*----- Revision history --------------------------------------------------*
*
* $Log: exc.h,v $
+ * Revision 1.5 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.4 1999/10/22 22:39:18 mdw
* Add an exception group for mLib.
*
*
*/
-#ifndef EXC_H
-#define EXC_H
+#ifndef MLIB_EXC_H
+#define MLIB_EXC_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: fdflags.h,v 1.1 1999/07/26 23:16:59 mdw Exp $
+ * $Id: fdflags.h,v 1.2 1999/12/10 23:42:04 mdw Exp $
*
* Manipulates flags on file descriptors
*
/*----- Revision history --------------------------------------------------*
*
* $Log: fdflags.h,v $
+ * Revision 1.2 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.1 1999/07/26 23:16:59 mdw
* Manipulate file descriptor flags.
*
*/
-#ifndef FDFLAGS_H
-#define FDFLAGS_H
+#ifndef MLIB_FDFLAGS_H
+#define MLIB_FDFLAGS_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: hash.h,v 1.1 1999/08/02 14:45:48 mdw Exp $
+ * $Id: hash.h,v 1.2 1999/12/10 23:42:04 mdw Exp $
*
* General hashtable infrastructure
*
/*----- Revision history --------------------------------------------------*
*
* $Log: hash.h,v $
+ * Revision 1.2 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.1 1999/08/02 14:45:48 mdw
* Break low-level hashtable code out from sym.
*
*/
-#ifndef HASH_H
-#define HASH_H
+#ifndef MLIB_HASH_H
+#define MLIB_HASH_H
#ifdef __cplusplus
extern "C" {
#include <stddef.h>
-#ifndef BITS_H
+#ifndef MLIB_BITS_H
# include "bits.h"
#endif
/* -*-c-*-
*
- * $Id: ident.h,v 1.1 1999/10/04 21:41:58 mdw Exp $
+ * $Id: ident.h,v 1.2 1999/12/10 23:42:04 mdw Exp $
*
* Nonblocking RFC931 client
*
/*----- Revision history --------------------------------------------------*
*
* $Log: ident.h,v $
+ * Revision 1.2 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.1 1999/10/04 21:41:58 mdw
* Added ident client from `fw'.
*
*/
-#ifndef IDENT_H
-#define IDENT_H
+#ifndef MLIB_IDENT_H
+#define MLIB_IDENT_H
#ifdef __cplusplus
extern "C" {
#include <netinet/in.h>
#include <arpa/inet.h>
-#ifndef CONN_H
+#ifndef MLIB_CONN_H
# include "conn.h"
#endif
-#ifndef SEL_H
+#ifndef MLIB_SEL_H
# include "sel.h"
#endif
-#ifndef SELBUF_H
+#ifndef MLIB_SELBUF_H
# include "selbuf.h"
#endif
/* -*-c-*-
*
- * $Id: lbuf.h,v 1.2 1999/05/17 20:36:08 mdw Exp $
+ * $Id: lbuf.h,v 1.3 1999/12/10 23:42:04 mdw Exp $
*
* Block-to-line buffering
*
/*----- Revision history --------------------------------------------------*
*
* $Log: lbuf.h,v $
+ * Revision 1.3 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.2 1999/05/17 20:36:08 mdw
* Make the magical constants for the buffer flags uppercase.
*
*
*/
-#ifndef LBUF_H
-#define LBUF_H
+#ifndef MLIB_LBUF_H
+#define MLIB_LBUF_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: lock.h,v 1.1 1999/05/15 10:33:53 mdw Exp $
+ * $Id: lock.h,v 1.2 1999/12/10 23:42:04 mdw Exp $
*
* Simplified POSIX locking interface
*
/*----- Revision history --------------------------------------------------*
*
* $Log: lock.h,v $
+ * Revision 1.2 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.1 1999/05/15 10:33:53 mdw
* Add simplified locking code.
*
*/
-#ifndef LOCK_H
-#define LOCK_H
+#ifndef MLIB_LOCK_H
+#define MLIB_LOCK_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: quis.h,v 1.4 1999/10/04 21:43:29 mdw Exp $
+ * $Id: quis.h,v 1.5 1999/12/10 23:42:04 mdw Exp $
*
* Setting the program name
*
/*----- Revision history --------------------------------------------------*
*
* $Log: quis.h,v $
+ * Revision 1.5 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.4 1999/10/04 21:43:29 mdw
* New function `pquis'.
*
*
*/
-#ifndef PROGNAME_H
-#define PROGNAME_H
+#ifndef MLIB_PROGNAME_H
+#define MLIB_PROGNAME_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: report.h,v 1.3 1999/05/06 19:51:35 mdw Exp $
+ * $Id: report.h,v 1.4 1999/12/10 23:42:04 mdw Exp $
*
* Reporting errors and things
*
/*----- Revision history --------------------------------------------------*
*
* $Log: report.h,v $
+ * Revision 1.4 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.3 1999/05/06 19:51:35 mdw
* Reformatted the LGPL notice a little bit.
*
*
*/
-#ifndef REPORT_H
-#define REPORT_H
+#ifndef MLIB_REPORT_H
+#define MLIB_REPORT_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: sel.h,v 1.6 1999/08/31 17:42:22 mdw Exp $
+ * $Id: sel.h,v 1.7 1999/12/10 23:42:04 mdw Exp $
*
* I/O multiplexing support
*
/*----- Revision history --------------------------------------------------*
*
* $Log: sel.h,v $
+ * Revision 1.7 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.6 1999/08/31 17:42:22 mdw
* New function `sel_force' to force a descriptor to be `selected'.
*
*
*/
-#ifndef SEL_H
-#define SEL_H
+#ifndef MLIB_SEL_H
+#define MLIB_SEL_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: selbuf.h,v 1.1 1999/05/14 21:01:15 mdw Exp $
+ * $Id: selbuf.h,v 1.2 1999/12/10 23:42:04 mdw Exp $
*
* Line-buffering select handler
*
/*----- Revision history --------------------------------------------------*
*
* $Log: selbuf.h,v $
+ * Revision 1.2 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.1 1999/05/14 21:01:15 mdw
* Integrated `select' handling bits from the background resolver project.
*
*/
-#ifndef SELBUF_H
-#define SELBUF_H
+#ifndef MLIB_SELBUF_H
+#define MLIB_SELBUF_H
#ifdef __cplusplus
extern "C" {
/*----- Header files ------------------------------------------------------*/
-#ifndef LBUF_H
+#ifndef MLIB_LBUF_H
# include "lbuf.h"
#endif
-#ifndef SEL_H
+#ifndef MLIB_SEL_H
# include "sel.h"
#endif
/* -*-c-*-
*
- * $Id: sig.h,v 1.1 1999/07/26 23:16:26 mdw Exp $
+ * $Id: sig.h,v 1.2 1999/12/10 23:42:04 mdw Exp $
*
* Signal handling
*
/*----- Revision history --------------------------------------------------*
*
* $Log: sig.h,v $
+ * Revision 1.2 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.1 1999/07/26 23:16:26 mdw
* Signal handling integrated into I/O system.
*
*/
-#ifndef SIG_H
-#define SIG_H
+#ifndef MLIB_SIG_H
+#define MLIB_SIG_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: str.h,v 1.2 1999/05/26 20:52:57 mdw Exp $
+ * $Id: str.h,v 1.3 1999/12/10 23:42:04 mdw Exp $
*
* Functions for hacking with strings
*
/*----- Revision history --------------------------------------------------*
*
* $Log: str.h,v $
+ * Revision 1.3 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.2 1999/05/26 20:52:57 mdw
* Add new `rest' argument for `str_split'.
*
*
*/
-#ifndef STR_H
-#define STR_H
+#ifndef MLIB_STR_H
+#define MLIB_STR_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: sub.h,v 1.4 1999/05/13 22:48:55 mdw Exp $
+ * $Id: sub.h,v 1.5 1999/12/10 23:42:04 mdw Exp $
*
* Allocation of known-size blocks
*
/*----- Revision history --------------------------------------------------*
*
* $Log: sub.h,v $
+ * Revision 1.5 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.4 1999/05/13 22:48:55 mdw
* Change `-ise' to `-ize' throughout.
*
*
*/
-#ifndef SUB_H
-#define SUB_H
+#ifndef MLIB_SUB_H
+#define MLIB_SUB_H
#ifdef __cplusplus
extern "C" {
#include <stdlib.h>
-#ifndef ALLOC_H
+#ifndef MLIB_ALLOC_H
# include "alloc.h"
#endif
/* -*-c-*-
*
- * $Id: sym.c,v 1.9 1999/10/22 22:36:37 mdw Exp $
+ * $Id: sym.c,v 1.10 1999/12/10 23:42:04 mdw Exp $
*
* Symbol table management
*
/*----- Revision history --------------------------------------------------*
*
* $Log: sym.c,v $
+ * Revision 1.10 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.9 1999/10/22 22:36:37 mdw
* New test structure for symbol tables.
*
/* --- @sym_remove@ --- *
*
- * Arguments: @sym_table *i@ = pointer to a symbol table object
+ * Arguments: @sym_table *t@ = pointer to a symbol table object
* @void *p@ = pointer to symbol table entry
*
* Returns: ---
/* -*-c-*-
*
- * $Id: sym.h,v 1.9 1999/08/02 16:53:48 mdw Exp $
+ * $Id: sym.h,v 1.10 1999/12/10 23:42:04 mdw Exp $
*
* Symbol table management
*
/*----- Revision history --------------------------------------------------*
*
* $Log: sym.h,v $
+ * Revision 1.10 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.9 1999/08/02 16:53:48 mdw
* Improve type safety for sym_iter objects.
*
*
*/
-#ifndef SYM_H
-#define SYM_H
+#ifndef MLIB_SYM_H
+#define MLIB_SYM_H
#ifdef __cplusplus
extern "C" {
#include <stddef.h>
-#ifndef BITS_H
+#ifndef MLIB_BITS_H
# include "bits.h"
#endif
-#ifndef HASH_H
+#ifndef MLIB_HASH_H
# include "hash.h"
#endif
/* --- @sym_remove@ --- *
*
- * Arguments: @sym_table *i@ = pointer to a symbol table object
+ * Arguments: @sym_table *t@ = pointer to a symbol table object
* @void *b@ = pointer to symbol table entry
*
* Returns: ---
/* -*-c-*-
*
- * $Id: trace.h,v 1.4 1999/10/22 22:39:52 mdw Exp $
+ * $Id: trace.h,v 1.5 1999/12/10 23:42:04 mdw Exp $
*
* Tracing functions for debugging
*
/*----- Revision history --------------------------------------------------*
*
* $Log: trace.h,v $
+ * Revision 1.5 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.4 1999/10/22 22:39:52 mdw
* New documented interface for tracing.
*
*
*/
-#ifndef TRACE_H
-#define TRACE_H
+#ifndef MLIB_TRACE_H
+#define MLIB_TRACE_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: track.h,v 1.4 1999/10/22 22:40:25 mdw Exp $
+ * $Id: track.h,v 1.5 1999/12/10 23:42:04 mdw Exp $
*
* Tracing functions for debugging
*
/*----- Revision history --------------------------------------------------*
*
* $Log: track.h,v $
+ * Revision 1.5 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.4 1999/10/22 22:40:25 mdw
* Change naming slightly. Still not documented, though.
*
*
*/
-#ifndef TRACK_H
-#define TRACK_H
+#ifndef MLIB_TRACK_H
+#define MLIB_TRACK_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: tv.h,v 1.5 1999/05/21 22:13:12 mdw Exp $
+ * $Id: tv.h,v 1.6 1999/12/10 23:42:04 mdw Exp $
*
* Manipulation of timeval structures
*
/*----- Revision history --------------------------------------------------*
*
* $Log: tv.h,v $
+ * Revision 1.6 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.5 1999/05/21 22:13:12 mdw
* Moved most of the code into exported macros. The main functions now
* implemented using the macros.
*
*/
-#ifndef TV_H
-#define TV_H
+#ifndef MLIB_TV_H
+#define MLIB_TV_H
#ifdef __cplusplus
extern "C" {
/* -*-c-*-
*
- * $Id: url.h,v 1.1 1999/06/01 09:49:48 mdw Exp $
+ * $Id: url.h,v 1.2 1999/12/10 23:42:04 mdw Exp $
*
* Parsing and construction of url-encoded name/value pairs
*
/*----- Revision history --------------------------------------------------*
*
* $Log: url.h,v $
+ * Revision 1.2 1999/12/10 23:42:04 mdw
+ * Change header file guard names.
+ *
* Revision 1.1 1999/06/01 09:49:48 mdw
* New files for url-encoding and decoding.
*
*/
-#ifndef URL_H
-#define URL_H
+#ifndef MLIB_URL_H
+#define MLIB_URL_H
#ifdef __cplusplus
extern "C" {
/*----- Header files ------------------------------------------------------*/
-#ifndef DSTR_H
+#ifndef MLIB_DSTR_H
# include "dstr.h"
#endif