Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / lib / strlcat.c

diff --git a/lib/strlcat.c b/lib/strlcat.c
index be211f82a8e527a8ec8e1dda6cc47e14559460ee..e3e29a72f33d3e61eb39177e9ebeed33c4dce665 100644 (file)
--- a/lib/strlcat.c
+++ b/lib/strlcat.c
@@ -1,30 +1,19 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
 /* Append a null-terminated string to another string, with length checking.
  * Copyright (C) 2016 Free Software Foundation, Inc.
  * This file is part of the GNU C Library.
- *
- * The GNU C Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * The GNU C Library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the GNU C Library; if not, see
- * <http://www.gnu.org/licenses/>.
  */
 
 /* adapted for Quagga from glibc patch submission originally from
  * Florian Weimer <fweimer@redhat.com>, 2016-05-18 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <string.h>
 
-#include "config.h"
-
 #ifndef HAVE_STRLCAT
 #undef strlcat
 
@@ -62,10 +51,8 @@ size_t strlcat(char *__restrict dest,
    (which the static_assert checks), then by the pigeonhole
    principle, the two input strings must overlap, which is
    undefined.  */
-#if __STDC_VERSION__ >= 201112L
        _Static_assert(sizeof(uintptr_t) == sizeof(size_t),
                       "theoretical maximum object size covers address space");
-#endif
        return dest_length + src_length;
 }
 #endif /* HAVE_STRLCAT */