svc/conntrack.in: Maintain config groups in a dictionary.

[tripe] / common / util.h

diff --git a/common/util.h b/common/util.h
index acdc0f6e909d79664321620ee2434fa48ccc2d5c..b844945fe9d69baa2c42b5557c5d81ce4565ba3d 100644 (file)
--- a/common/util.h
+++ b/common/util.h
@@ -9,19 +9,18 @@
  *
  * This file is part of Trivial IP Encryption (TrIPE).
  *
- * TrIPE 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 2 of the License, or
- * (at your option) any later version.
+ * TrIPE 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.
  *
- * TrIPE 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.
+ * TrIPE 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 TrIPE; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with TrIPE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef UTIL_H
@@ -33,22 +32,12 @@
 
 #include <sys/types.h>
 
+#include <mLib/macros.h>
+
 #ifdef __cplusplus
   extern "C" {
 #endif
 
-/*----- Macros ------------------------------------------------------------*/
-
-/* --- @IGNORE@ --- *
- *
- * Arguments:  @expr@ = an expression whose value is to be ignored
- *
- * Use:                Ignores the value of an expression, even if compilers want
- *             us not to.
- */
-
-#define IGNORE(expr) do { if (expr) ; } while (0)
-
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @u_quotify@ --- *