From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 12 Apr 2018 06:49:02 +0000 (+0600)
Subject: ...and a few more
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fff7b1e235783f6243abdcf50cbae397aef2461;p=thirdparty%2Ffreeradius-server.git

...and a few more
---

diff --git a/src/include/all.mk b/src/include/all.mk
index 962b4bf2835..b68962d91a0 100644
--- a/src/include/all.mk
+++ b/src/include/all.mk
@@ -81,7 +81,7 @@ HEADERS	+= $(notdir ${HEADERS_RFC})
 .PRECIOUS: $(HEADERS_RFC)
 
 NORMALIZE	:= tr -- '[:lower:]/.-' '[:upper:]___' | sed 's/^/\#define /;s/241_//;'
-HEADER		:= "/* AUTO_GENERATED FILE.  DO NOT EDIT */"
+HEADER		:= "/* AUTO_GENERATED FILE.  DO NOT EDIT */\n\#pragma once"
 
 src/include/attributes.h: share/dictionary.freeradius.internal
 	${Q}$(ECHO) HEADER $@
diff --git a/src/include/connection.h b/src/include/connection.h
index 323af9a3fce..09b295e5143 100644
--- a/src/include/connection.h
+++ b/src/include/connection.h
@@ -1,3 +1,4 @@
+#pragma once
 /*
  *   This program is is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/src/include/stdatomic.h b/src/include/stdatomic.h
index 71e472918c7..780e5a0fb67 100644
--- a/src/include/stdatomic.h
+++ b/src/include/stdatomic.h
@@ -1,3 +1,4 @@
+#pragma once
 /*
  * An implementation of C11 stdatomic.h directly borrowed from FreeBSD
  * (original copyright follows), with minor modifications for
@@ -44,10 +45,6 @@
  *
  * $FreeBSD: src/include/stdatomic.h,v 1.10.2.2 2012/05/30 19:21:54 theraven Exp $
  */
-
-#ifndef _STDATOMIC_H_
-#define	_STDATOMIC_H_
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -365,5 +362,3 @@ typedef atomic_bool			atomic_flag;
 	atomic_flag_clear_explicit(object, memory_order_seq_cst)
 #define	atomic_flag_test_and_set(object)				\
 	atomic_flag_test_and_set_explicit(object, memory_order_seq_cst)
-
-#endif /* !_STDATOMIC_H_ */
diff --git a/src/lib/ldap/libfreeradius-ldap.h b/src/lib/ldap/libfreeradius-ldap.h
index 4f458dc94cb..0133ef4f7e6 100644
--- a/src/lib/ldap/libfreeradius-ldap.h
+++ b/src/lib/ldap/libfreeradius-ldap.h
@@ -1,3 +1,4 @@
+#pragma once
 /**
  * $Id$
  * @file lib/ldap/libfreeradius-ldap.h
@@ -12,9 +13,6 @@
  * @copyright 2017 The FreeRADIUS Server Project.
  * @copyright 2017 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#ifndef LIBFREERADIUS_LDAP_H
-#define	LIBFREERADIUS_LDAP_H
-
 #include <freeradius-devel/radiusd.h>
 #include <freeradius-devel/connection.h>
 #include <lber.h>
@@ -551,6 +549,3 @@ uint8_t		*fr_ldap_berval_to_bin(TALLOC_CTX *ctx, struct berval const *in);
 
 int		fr_ldap_parse_url_extensions(LDAPControl **sss, REQUEST *request,
 					     fr_ldap_connection_t *conn, char **extensions);
-
-
-#endif