Clean up ill-advised or unusual header guards

Cleaned up with scripts/clean-header-guards.pl.

Backports commit 2a6a4076e117113ebec97b1821071afccfdfbc96 from qemu
This commit is contained in:
Markus Armbruster 2018-02-25 04:22:42 -05:00 committed by Lioncash
parent 9ae2fc4d9e
commit 1275b9b459
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
12 changed files with 29 additions and 28 deletions

View file

@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _EXEC_ALL_H_ #ifndef EXEC_ALL_H
#define _EXEC_ALL_H_ #define EXEC_ALL_H
#include "qemu-common.h" #include "qemu-common.h"
#include "exec/tb-context.h" #include "exec/tb-context.h"

View file

@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef QEMU_TB_CONTEXT_H_ #ifndef QEMU_TB_CONTEXT_H
#define QEMU_TB_CONTEXT_H_ #define QEMU_TB_CONTEXT_H
#include "qemu/thread.h" #include "qemu/thread.h"

View file

@ -30,8 +30,9 @@
* You can contact the author at : * You can contact the author at :
* - xxHash source repository : https://github.com/Cyan4973/xxHash * - xxHash source repository : https://github.com/Cyan4973/xxHash
*/ */
#ifndef EXEC_TB_HASH_XX
#define EXEC_TB_HASH_XX #ifndef EXEC_TB_HASH_XX_H
#define EXEC_TB_HASH_XX_H
#include "qemu/bitops.h" #include "qemu/bitops.h"
@ -91,4 +92,4 @@ uint32_t tb_hash_func5(uint64_t a0, uint64_t b0, uint32_t e)
return h32; return h32;
} }
#endif /* EXEC_TB_HASH_XX */ #endif /* EXEC_TB_HASH_XX_H */

View file

@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef EXEC_TB_HASH #ifndef EXEC_TB_HASH_H
#define EXEC_TB_HASH #define EXEC_TB_HASH_H
#include "exec/exec-all.h" #include "exec/exec-all.h"
#include "exec/tb-hash-xx.h" #include "exec/tb-hash-xx.h"

View file

@ -12,8 +12,8 @@
* atomic primitive is meant to provide. * atomic primitive is meant to provide.
*/ */
#ifndef __QEMU_ATOMIC_H #ifndef QEMU_ATOMIC_H
#define __QEMU_ATOMIC_H 1 #define QEMU_ATOMIC_H
#include "qemu/compiler.h" #include "qemu/compiler.h"
@ -385,4 +385,4 @@ void _ReadWriteBarrier(void);
#endif #endif
#endif /* __ATOMIC_RELAXED */ #endif /* __ATOMIC_RELAXED */
#endif /* __QEMU_ATOMIC_H */ #endif /* QEMU_ATOMIC_H */

View file

@ -1,5 +1,5 @@
#ifndef QEMU_MMAP_ALLOC #ifndef QEMU_MMAP_ALLOC_H
#define QEMU_MMAP_ALLOC #define QEMU_MMAP_ALLOC_H
#include "qemu-common.h" #include "qemu-common.h"

View file

@ -37,8 +37,8 @@
* @(#)queue.h 8.5 (Berkeley) 8/20/94 * @(#)queue.h 8.5 (Berkeley) 8/20/94
*/ */
#ifndef QEMU_SYS_QUEUE_H_ #ifndef QEMU_SYS_QUEUE_H
#define QEMU_SYS_QUEUE_H_ #define QEMU_SYS_QUEUE_H
/* /*
* This file defines four types of data structures: singly-linked lists, * This file defines four types of data structures: singly-linked lists,
@ -411,4 +411,4 @@ struct { \
#define QTAILQ_PREV(elm, headname, field) \ #define QTAILQ_PREV(elm, headname, field) \
(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)) (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
#endif /* !QEMU_SYS_QUEUE_H_ */ #endif /* QEMU_SYS_QUEUE_H */

View file

@ -1,5 +1,5 @@
#ifndef __QEMU_THREAD_POSIX_H #ifndef QEMU_THREAD_POSIX_H
#define __QEMU_THREAD_POSIX_H 1 #define QEMU_THREAD_POSIX_H
#include <pthread.h> #include <pthread.h>
#include <semaphore.h> #include <semaphore.h>

View file

@ -1,5 +1,5 @@
#ifndef __QEMU_THREAD_WIN32_H #ifndef QEMU_THREAD_WIN32_H
#define __QEMU_THREAD_WIN32_H 1 #define QEMU_THREAD_WIN32_H
#include <windows.h> #include <windows.h>

View file

@ -1,5 +1,5 @@
#ifndef __QEMU_THREAD_H #ifndef QEMU_THREAD_H
#define __QEMU_THREAD_H 1 #define QEMU_THREAD_H
#include "unicorn/platform.h" #include "unicorn/platform.h"

View file

@ -1,5 +1,5 @@
#ifndef __SVM_H #ifndef SVM_H
#define __SVM_H #define SVM_H
#define TLB_CONTROL_DO_NOTHING 0 #define TLB_CONTROL_DO_NOTHING 0
#define TLB_CONTROL_FLUSH_ALL_ASID 1 #define TLB_CONTROL_FLUSH_ALL_ASID 1

View file

@ -1,5 +1,5 @@
#if !defined (__QEMU_MIPS_DEFS_H__) #ifndef QEMU_MIPS_DEFS_H
#define __QEMU_MIPS_DEFS_H__ #define QEMU_MIPS_DEFS_H
/* If we want to use host float regs... */ /* If we want to use host float regs... */
//#define USE_HOST_FLOAT_REGS //#define USE_HOST_FLOAT_REGS
@ -88,4 +88,4 @@
Note that we still maintain Count/Compare to match the host clock. */ Note that we still maintain Count/Compare to match the host clock. */
//#define MIPS_STRICT_STANDARD 1 //#define MIPS_STRICT_STANDARD 1
#endif /* !defined (__QEMU_MIPS_DEFS_H__) */ #endif /* QEMU_MIPS_DEFS_H */