Namespace header inclusion protection macros

Use LIBBSD_, and remove trailing underscores.
This commit is contained in:
Guillem Jover 2017-06-14 02:44:37 +02:00
parent 47013bc92a
commit ec5d9a685a
10 changed files with 29 additions and 29 deletions

View File

@ -36,8 +36,8 @@
* $FreeBSD: src/lib/libutil/libutil.h,v 1.47 2008/04/23 00:49:12 scf Exp $ * $FreeBSD: src/lib/libutil/libutil.h,v 1.47 2008/04/23 00:49:12 scf Exp $
*/ */
#ifndef _LIBUTIL_H_ #ifndef LIBBSD_LIBUTIL_H
#define _LIBUTIL_H_ #define LIBBSD_LIBUTIL_H
#include <features.h> #include <features.h>
#include <sys/cdefs.h> #include <sys/cdefs.h>
@ -86,4 +86,4 @@ __END_DECLS
#define FPARSELN_UNESCREST 0x08 #define FPARSELN_UNESCREST 0x08
#define FPARSELN_UNESCALL 0x0f #define FPARSELN_UNESCALL 0x0f
#endif /* !_LIBUTIL_H_ */ #endif /* !LIBBSD_LIBUTIL_H */

View File

@ -12,8 +12,8 @@
* with every copy. * with every copy.
*/ */
#ifndef _MD5_H_ #ifndef LIBBSD_MD5_H
#define _MD5_H_ #define LIBBSD_MD5_H
#include <stdint.h> #include <stdint.h>
@ -51,4 +51,4 @@ char *MD5Data(const uint8_t *, size_t, char *)
__attribute__((__bounded__(__minbytes__,3,MD5_DIGEST_STRING_LENGTH))); __attribute__((__bounded__(__minbytes__,3,MD5_DIGEST_STRING_LENGTH)));
__END_DECLS __END_DECLS
#endif /* _MD5_H_ */ #endif /* LIBBSD_MD5_H */

View File

@ -30,8 +30,8 @@
* $FreeBSD: src/sys/netinet/ip_icmp.h,v 1.22 2004/04/07 20:46:13 imp Exp $ * $FreeBSD: src/sys/netinet/ip_icmp.h,v 1.22 2004/04/07 20:46:13 imp Exp $
*/ */
#ifndef _NETINET_IP_ICMP_H_ #ifndef LIBBSD_NETINET_IP_ICMP_H
#define _NETINET_IP_ICMP_H_ #define LIBBSD_NETINET_IP_ICMP_H
#include <sys/types.h> /* uint32_t */ #include <sys/types.h> /* uint32_t */
#include <netinet/in.h> /* in_addr */ #include <netinet/in.h> /* in_addr */

View File

@ -20,8 +20,8 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512. * Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/ */
#ifndef _READPASSPHRASE_H_ #ifndef LIBBSD_READPASSPHRASE_H
#define _READPASSPHRASE_H_ #define LIBBSD_READPASSPHRASE_H
#define RPP_ECHO_OFF 0x00 /* Turn off echo (default). */ #define RPP_ECHO_OFF 0x00 /* Turn off echo (default). */
#define RPP_ECHO_ON 0x01 /* Leave echo on. */ #define RPP_ECHO_ON 0x01 /* Leave echo on. */
@ -38,4 +38,4 @@ __BEGIN_DECLS
char * readpassphrase(const char *, char *, size_t, int); char * readpassphrase(const char *, char *, size_t, int);
__END_DECLS __END_DECLS
#endif /* !_READPASSPHRASE_H_ */ #endif /* !LIBBSD_READPASSPHRASE_H */

View File

@ -29,8 +29,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef _STRINGLIST_H #ifndef LIBBSD_STRINGLIST_H
#define _STRINGLIST_H #define LIBBSD_STRINGLIST_H
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/types.h> #include <sys/types.h>
@ -51,4 +51,4 @@ char *sl_find(StringList *, const char *);
int sl_delete(StringList *, const char *, int); int sl_delete(StringList *, const char *, int);
__END_DECLS __END_DECLS
#endif /* _STRINGLIST_H */ #endif /* LIBBSD_STRINGLIST_H */

View File

@ -32,8 +32,8 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _SYS_BITSTRING_H_ #ifndef LIBBSD_SYS_BITSTRING_H
#define _SYS_BITSTRING_H_ #define LIBBSD_SYS_BITSTRING_H
typedef unsigned char bitstr_t; typedef unsigned char bitstr_t;
@ -143,4 +143,4 @@ typedef unsigned char bitstr_t;
*(value) = _value; \ *(value) = _value; \
} while (0) } while (0)
#endif /* !_SYS_BITSTRING_H_ */ #endif /* !LIBBSD_SYS_BITSTRING_H */

View File

@ -30,8 +30,8 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _SYS_QUEUE_H_ #ifndef LIBBSD_SYS_QUEUE_H
#define _SYS_QUEUE_H_ #define LIBBSD_SYS_QUEUE_H
#include <sys/cdefs.h> #include <sys/cdefs.h>
@ -691,4 +691,4 @@ struct { \
(head2)->tqh_last = &(head2)->tqh_first; \ (head2)->tqh_last = &(head2)->tqh_first; \
} while (0) } while (0)
#endif /* !_SYS_QUEUE_H_ */ #endif /* !LIBBSD_SYS_QUEUE_H */

View File

@ -27,8 +27,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef _SYS_TREE_H_ #ifndef LIBBSD_SYS_TREE_H
#define _SYS_TREE_H_ #define LIBBSD_SYS_TREE_H
#include <sys/cdefs.h> #include <sys/cdefs.h>
@ -762,4 +762,4 @@ name##_RB_MINMAX(struct name *head, int val) \
((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL); \ ((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL); \
(x) = (y)) (x) = (y))
#endif /* _SYS_TREE_H_ */ #endif /* LIBBSD_SYS_TREE_H */

View File

@ -38,8 +38,8 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _TIMECONV_H_ #ifndef LIBBSD_TIMECONV_H
#define _TIMECONV_H_ #define LIBBSD_TIMECONV_H
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <stdint.h> #include <stdint.h>
@ -54,4 +54,4 @@ time_t _long_to_time(long tlong);
int _time_to_int(time_t t); int _time_to_int(time_t t);
time_t _int_to_time(int tint); time_t _int_to_time(int tint);
#endif /* _TIMECONV_H_ */ #endif /* LIBBSD_TIMECONV_H */

View File

@ -30,8 +30,8 @@
* $FreeBSD: src/include/vis.h,v 1.11 2003/10/30 10:40:49 phk Exp $ * $FreeBSD: src/include/vis.h,v 1.11 2003/10/30 10:40:49 phk Exp $
*/ */
#ifndef _VIS_H_ #ifndef LIBBSD_VIS_H
#define _VIS_H_ #define LIBBSD_VIS_H
#include <sys/types.h> #include <sys/types.h>
@ -85,4 +85,4 @@ ssize_t strnunvis(char *, const char *, size_t);
int unvis(char *, int, int *, int); int unvis(char *, int, int *, int);
__END_DECLS __END_DECLS
#endif /* !_VIS_H_ */ #endif /* !LIBBSD_VIS_H */