openocd: revert workarounds for 'expr' syntax change

[openocd.git] / src / helper / util.h

diff --git a/src/helper/util.h b/src/helper/util.h
index 48db725cf35f0640cdf83e120d0e7f41c469aa7a..3ccdc4fdfe750a95e3375dee1292324b897299eb 100644 (file)
--- a/src/helper/util.h
+++ b/src/helper/util.h
@@ -1,27 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2010 by Øyvind Harboe                                   *
- *                                                                         *
- *   This program 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.                                   *
- *                                                                         *
- *   This program 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 this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
-#ifndef HELPER_UTILS_H
-#define HELPER_UTILS_H
+#ifndef OPENOCD_HELPER_UTIL_H
+#define OPENOCD_HELPER_UTIL_H
 
 struct command_context;
 
 int util_init(struct command_context *cmd_ctx);
 
-#endif /* HELPER_UTILS_H */
+#endif /* OPENOCD_HELPER_UTIL_H */