Browse Source

Clean up ill-advised or unusual header guards

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

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
tags/v2.7.0-rc0
Markus Armbruster 3 years ago
parent
commit
2a6a4076e1
141 changed files with 385 additions and 378 deletions
  1. 3
    3
      contrib/ivshmem-client/ivshmem-client.h
  2. 3
    3
      contrib/ivshmem-server/ivshmem-server.h
  3. 3
    3
      crypto/block-luks.h
  4. 3
    3
      crypto/block-qcow.h
  5. 2
    2
      fsdev/9p-iov-marshal.h
  6. 2
    2
      fsdev/9p-marshal.h
  7. 3
    2
      hw/9pfs/9p-proxy.h
  8. 3
    2
      hw/9pfs/9p-xattr.h
  9. 2
    2
      hw/9pfs/9p.h
  10. 2
    2
      hw/9pfs/coth.h
  11. 2
    2
      hw/9pfs/virtio-9p.h
  12. 2
    2
      hw/arm/strongarm.h
  13. 2
    2
      hw/audio/fmopl.h
  14. 3
    3
      hw/block/xen_blkif.h
  15. 3
    3
      hw/core/uboot_image.h
  16. 3
    3
      hw/display/vga.h
  17. 3
    3
      hw/microblaze/boot.h
  18. 4
    3
      hw/net/fsl_etsec/etsec.h
  19. 3
    3
      hw/net/fsl_etsec/registers.h
  20. 3
    3
      hw/net/rocker/rocker.h
  21. 2
    3
      hw/net/rocker/rocker_desc.h
  22. 3
    3
      hw/net/rocker/rocker_fp.h
  23. 3
    3
      hw/net/rocker/rocker_hw.h
  24. 3
    3
      hw/net/rocker/rocker_of_dpa.h
  25. 2
    2
      hw/net/rocker/rocker_tlv.h
  26. 3
    3
      hw/net/rocker/rocker_world.h
  27. 2
    2
      hw/net/vmxnet3.h
  28. 3
    3
      hw/net/vmxnet_debug.h
  29. 4
    3
      hw/ppc/mac.h
  30. 3
    3
      hw/sh4/sh7750_regnames.h
  31. 2
    2
      hw/sh4/sh7750_regs.h
  32. 2
    2
      hw/xtensa/bootparam.h
  33. 3
    3
      include/crypto/afsplit.h
  34. 3
    3
      include/crypto/block.h
  35. 3
    3
      include/crypto/cipher.h
  36. 3
    3
      include/crypto/hash.h
  37. 3
    3
      include/crypto/init.h
  38. 3
    3
      include/crypto/ivgen.h
  39. 3
    3
      include/crypto/pbkdf.h
  40. 3
    3
      include/crypto/random.h
  41. 3
    3
      include/crypto/secret.h
  42. 3
    4
      include/crypto/xts.h
  43. 3
    3
      include/disas/disas.h
  44. 3
    4
      include/elf.h
  45. 2
    2
      include/exec/exec-all.h
  46. 2
    2
      include/exec/tb-context.h
  47. 4
    3
      include/exec/tb-hash-xx.h
  48. 2
    2
      include/exec/tb-hash.h
  49. 3
    4
      include/hw/arm/exynos4210.h
  50. 3
    3
      include/hw/gpio/imx_gpio.h
  51. 3
    3
      include/hw/i2c/i2c-ddc.h
  52. 3
    3
      include/hw/i2c/imx_i2c.h
  53. 3
    3
      include/hw/input/adb.h
  54. 3
    3
      include/hw/intc/mips_gic.h
  55. 3
    3
      include/hw/ppc/openpic.h
  56. 3
    3
      include/hw/ppc/spapr.h
  57. 4
    3
      include/hw/ppc/spapr_drc.h
  58. 4
    3
      include/hw/ppc/spapr_vio.h
  59. 4
    3
      include/hw/ppc/xics.h
  60. 3
    3
      include/hw/s390x/ebcdic.h
  61. 3
    3
      include/hw/s390x/s390_flic.h
  62. 3
    3
      include/hw/s390x/storage-keys.h
  63. 4
    3
      include/hw/sd/sd.h
  64. 3
    3
      include/hw/sh4/sh_intc.h
  65. 3
    3
      include/hw/sparc/grlib.h
  66. 3
    3
      include/hw/timer/mips_gictimer.h
  67. 3
    4
      include/hw/virtio/vhost-backend.h
  68. 5
    3
      include/hw/virtio/virtio-access.h
  69. 2
    2
      include/hw/virtio/virtio-balloon.h
  70. 2
    2
      include/hw/virtio/virtio-blk.h
  71. 3
    3
      include/hw/virtio/virtio-input.h
  72. 2
    2
      include/hw/virtio/virtio-net.h
  73. 2
    2
      include/hw/virtio/virtio-rng.h
  74. 3
    3
      include/hw/virtio/virtio-scsi.h
  75. 3
    2
      include/hw/virtio/virtio-serial.h
  76. 2
    2
      include/hw/virtio/virtio.h
  77. 3
    3
      include/io/channel-buffer.h
  78. 3
    3
      include/io/channel-command.h
  79. 3
    3
      include/io/channel-file.h
  80. 3
    3
      include/io/channel-socket.h
  81. 3
    3
      include/io/channel-tls.h
  82. 3
    3
      include/io/channel-util.h
  83. 3
    3
      include/io/channel-watch.h
  84. 3
    3
      include/io/channel-websock.h
  85. 3
    3
      include/io/channel.h
  86. 3
    3
      include/io/task.h
  87. 3
    2
      include/libdecnumber/decContext.h
  88. 3
    2
      include/libdecnumber/decNumber.h
  89. 3
    2
      include/libdecnumber/dpd/decimal128.h
  90. 3
    2
      include/libdecnumber/dpd/decimal32.h
  91. 3
    2
      include/libdecnumber/dpd/decimal64.h
  92. 3
    3
      include/net/vhost-user.h
  93. 3
    3
      include/qemu/acl.h
  94. 3
    5
      include/qemu/atomic.h
  95. 3
    3
      include/qemu/base64.h
  96. 3
    3
      include/qemu/buffer.h
  97. 2
    2
      include/qemu/mmap-alloc.h
  98. 3
    3
      include/qemu/queue.h
  99. 2
    2
      include/qemu/thread-posix.h
  100. 2
    2
      include/qemu/thread-win32.h
  101. 2
    2
      include/qemu/thread.h
  102. 2
    2
      include/sysemu/balloon.h
  103. 3
    3
      include/sysemu/device_tree.h
  104. 2
    2
      linux-user/arm/nwfpe/fpa11.h
  105. 2
    2
      linux-user/arm/nwfpe/fpopcode.h
  106. 2
    2
      linux-user/arm/nwfpe/fpsr.h
  107. 3
    2
      linux-user/linux_loop.h
  108. 2
    2
      linux-user/tilegx/syscall_nr.h
  109. 2
    2
      qemu-options.h
  110. 2
    2
      slirp/if.h
  111. 2
    2
      slirp/ip.h
  112. 2
    2
      slirp/ip6.h
  113. 2
    2
      slirp/ip_icmp.h
  114. 2
    2
      slirp/libslirp.h
  115. 2
    2
      slirp/mbuf.h
  116. 2
    2
      slirp/misc.h
  117. 2
    2
      slirp/sbuf.h
  118. 3
    3
      slirp/socket.h
  119. 2
    2
      slirp/tcp.h
  120. 2
    2
      slirp/tcp_timer.h
  121. 2
    2
      slirp/tcp_var.h
  122. 2
    2
      slirp/tcpip.h
  123. 2
    2
      slirp/udp.h
  124. 2
    2
      target-i386/svm.h
  125. 3
    3
      target-mips/kvm_mips.h
  126. 3
    3
      target-mips/mips-defs.h
  127. 3
    3
      target-ppc/helper_regs.h
  128. 3
    3
      target-ppc/kvm_ppc.h
  129. 3
    3
      target-ppc/mmu-hash32.h
  130. 3
    3
      target-ppc/mmu-hash64.h
  131. 3
    3
      target-tricore/tricore-defs.h
  132. 3
    3
      tests/boot-sector.h
  133. 2
    2
      tests/libqos/ahci.h
  134. 2
    2
      tests/libqos/libqos-pc.h
  135. 2
    2
      tests/libqos/libqos.h
  136. 3
    3
      ui/keymaps.h
  137. 3
    3
      ui/sdl_zoom.h
  138. 3
    6
      ui/vnc-auth-sasl.h
  139. 3
    4
      ui/vnc-auth-vencrypt.h
  140. 3
    3
      ui/vnc-ws.h
  141. 3
    3
      ui/vnc.h

+ 3
- 3
contrib/ivshmem-client/ivshmem-client.h View File

@@ -6,8 +6,8 @@
6 6
  * top-level directory.
7 7
  */
8 8
 
9
-#ifndef _IVSHMEM_CLIENT_H_
10
-#define _IVSHMEM_CLIENT_H_
9
+#ifndef IVSHMEM_CLIENT_H
10
+#define IVSHMEM_CLIENT_H
11 11
 
12 12
 /**
13 13
  * This file provides helper to implement an ivshmem client. It is used
@@ -209,4 +209,4 @@ ivshmem_client_search_peer(IvshmemClient *client, int64_t peer_id);
209 209
  */
210 210
 void ivshmem_client_dump(const IvshmemClient *client);
211 211
 
212
-#endif /* _IVSHMEM_CLIENT_H_ */
212
+#endif /* IVSHMEM_CLIENT_H */

+ 3
- 3
contrib/ivshmem-server/ivshmem-server.h View File

@@ -6,8 +6,8 @@
6 6
  * top-level directory.
7 7
  */
8 8
 
9
-#ifndef _IVSHMEM_SERVER_H_
10
-#define _IVSHMEM_SERVER_H_
9
+#ifndef IVSHMEM_SERVER_H
10
+#define IVSHMEM_SERVER_H
11 11
 
12 12
 /**
13 13
  * The ivshmem server is a daemon that creates a unix socket in listen
@@ -163,4 +163,4 @@ ivshmem_server_search_peer(IvshmemServer *server, int64_t peer_id);
163 163
  */
164 164
 void ivshmem_server_dump(const IvshmemServer *server);
165 165
 
166
-#endif /* _IVSHMEM_SERVER_H_ */
166
+#endif /* IVSHMEM_SERVER_H */

+ 3
- 3
crypto/block-luks.h View File

@@ -18,11 +18,11 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QCRYPTO_BLOCK_LUKS_H__
22
-#define QCRYPTO_BLOCK_LUKS_H__
21
+#ifndef QCRYPTO_BLOCK_LUKS_H
22
+#define QCRYPTO_BLOCK_LUKS_H
23 23
 
24 24
 #include "crypto/blockpriv.h"
25 25
 
26 26
 extern const QCryptoBlockDriver qcrypto_block_driver_luks;
27 27
 
28
-#endif /* QCRYPTO_BLOCK_LUKS_H__ */
28
+#endif /* QCRYPTO_BLOCK_LUKS_H */

+ 3
- 3
crypto/block-qcow.h View File

@@ -18,11 +18,11 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QCRYPTO_BLOCK_QCOW_H__
22
-#define QCRYPTO_BLOCK_QCOW_H__
21
+#ifndef QCRYPTO_BLOCK_QCOW_H
22
+#define QCRYPTO_BLOCK_QCOW_H
23 23
 
24 24
 #include "crypto/blockpriv.h"
25 25
 
26 26
 extern const QCryptoBlockDriver qcrypto_block_driver_qcow;
27 27
 
28
-#endif /* QCRYPTO_BLOCK_QCOW_H__ */
28
+#endif /* QCRYPTO_BLOCK_QCOW_H */

+ 2
- 2
fsdev/9p-iov-marshal.h View File

@@ -1,5 +1,5 @@
1
-#ifndef _QEMU_9P_IOV_MARSHAL_H
2
-#define _QEMU_9P_IOV_MARSHAL_H
1
+#ifndef QEMU_9P_IOV_MARSHAL_H
2
+#define QEMU_9P_IOV_MARSHAL_H
3 3
 
4 4
 #include "9p-marshal.h"
5 5
 

+ 2
- 2
fsdev/9p-marshal.h View File

@@ -1,5 +1,5 @@
1
-#ifndef _QEMU_9P_MARSHAL_H
2
-#define _QEMU_9P_MARSHAL_H
1
+#ifndef QEMU_9P_MARSHAL_H
2
+#define QEMU_9P_MARSHAL_H
3 3
 
4 4
 typedef struct V9fsString
5 5
 {

+ 3
- 2
hw/9pfs/9p-proxy.h View File

@@ -9,8 +9,9 @@
9 9
  * This work is licensed under the terms of the GNU GPL, version 2.  See
10 10
  * the COPYING file in the top-level directory.
11 11
  */
12
-#ifndef _QEMU_9P_PROXY_H
13
-#define _QEMU_9P_PROXY_H
12
+
13
+#ifndef QEMU_9P_PROXY_H
14
+#define QEMU_9P_PROXY_H
14 15
 
15 16
 #define PROXY_MAX_IO_SZ (64 * 1024)
16 17
 #define V9FS_FD_VALID INT_MAX

+ 3
- 2
hw/9pfs/9p-xattr.h View File

@@ -10,8 +10,9 @@
10 10
  * the COPYING file in the top-level directory.
11 11
  *
12 12
  */
13
-#ifndef _QEMU_9P_XATTR_H
14
-#define _QEMU_9P_XATTR_H
13
+
14
+#ifndef QEMU_9P_XATTR_H
15
+#define QEMU_9P_XATTR_H
15 16
 
16 17
 #include "qemu/xattr.h"
17 18
 

+ 2
- 2
hw/9pfs/9p.h View File

@@ -1,5 +1,5 @@
1
-#ifndef _QEMU_9P_H
2
-#define _QEMU_9P_H
1
+#ifndef QEMU_9P_H
2
+#define QEMU_9P_H
3 3
 
4 4
 #include <dirent.h>
5 5
 #include <utime.h>

+ 2
- 2
hw/9pfs/coth.h View File

@@ -12,8 +12,8 @@
12 12
  *
13 13
  */
14 14
 
15
-#ifndef _QEMU_9P_COTH_H
16
-#define _QEMU_9P_COTH_H
15
+#ifndef QEMU_9P_COTH_H
16
+#define QEMU_9P_COTH_H
17 17
 
18 18
 #include "qemu/thread.h"
19 19
 #include "qemu/coroutine.h"

+ 2
- 2
hw/9pfs/virtio-9p.h View File

@@ -1,5 +1,5 @@
1
-#ifndef _QEMU_VIRTIO_9P_H
2
-#define _QEMU_VIRTIO_9P_H
1
+#ifndef QEMU_VIRTIO_9P_H
2
+#define QEMU_VIRTIO_9P_H
3 3
 
4 4
 #include "standard-headers/linux/virtio_9p.h"
5 5
 #include "hw/virtio/virtio.h"

+ 2
- 2
hw/arm/strongarm.h View File

@@ -1,5 +1,5 @@
1
-#ifndef _STRONGARM_H
2
-#define _STRONGARM_H
1
+#ifndef STRONGARM_H
2
+#define STRONGARM_H
3 3
 
4 4
 #include "exec/memory.h"
5 5
 #include "target-arm/cpu-qom.h"

+ 2
- 2
hw/audio/fmopl.h View File

@@ -1,5 +1,5 @@
1
-#ifndef __FMOPL_H_
2
-#define __FMOPL_H_
1
+#ifndef FMOPL_H
2
+#define FMOPL_H
3 3
 
4 4
 /* --- select emulation chips --- */
5 5
 #define BUILD_YM3812 (HAS_YM3812)

+ 3
- 3
hw/block/xen_blkif.h View File

@@ -1,5 +1,5 @@
1
-#ifndef __XEN_BLKIF_H__
2
-#define __XEN_BLKIF_H__
1
+#ifndef XEN_BLKIF_H
2
+#define XEN_BLKIF_H
3 3
 
4 4
 #include <xen/io/ring.h>
5 5
 #include <xen/io/blkif.h>
@@ -143,4 +143,4 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst,
143 143
     }
144 144
 }
145 145
 
146
-#endif /* __XEN_BLKIF_H__ */
146
+#endif /* XEN_BLKIF_H */

+ 3
- 3
hw/core/uboot_image.h View File

@@ -26,8 +26,8 @@
26 26
  ********************************************************************
27 27
  */
28 28
 
29
-#ifndef __UBOOT_IMAGE_H__
30
-#define __UBOOT_IMAGE_H__
29
+#ifndef UBOOT_IMAGE_H
30
+#define UBOOT_IMAGE_H
31 31
 
32 32
 /*
33 33
  * Operating System Codes
@@ -155,4 +155,4 @@ typedef struct uboot_image_header {
155 155
 } uboot_image_header_t;
156 156
 
157 157
 
158
-#endif	/* __IMAGE_H__ */
158
+#endif /* UBOOT_IMAGE_H */

+ 3
- 3
hw/display/vga.h View File

@@ -14,8 +14,8 @@
14 14
  *
15 15
  */
16 16
 
17
-#ifndef __linux_video_vga_h__
18
-#define __linux_video_vga_h__
17
+#ifndef LINUX_VIDEO_VGA_H
18
+#define LINUX_VIDEO_VGA_H
19 19
 
20 20
 /* Some of the code below is taken from SVGAlib.  The original,
21 21
    unmodified copyright notice for that code is below. */
@@ -156,4 +156,4 @@
156 156
 /* VGA graphics controller bit masks */
157 157
 #define VGA_GR06_GRAPHICS_MODE  0x01
158 158
 
159
-#endif /* __linux_video_vga_h__ */
159
+#endif /* LINUX_VIDEO_VGA_H */

+ 3
- 3
hw/microblaze/boot.h View File

@@ -1,5 +1,5 @@
1
-#ifndef __MICROBLAZE_BOOT__
2
-#define __MICROBLAZE_BOOT__
1
+#ifndef MICROBLAZE_BOOT_H
2
+#define MICROBLAZE_BOOT_H
3 3
 
4 4
 #include "hw/hw.h"
5 5
 
@@ -9,4 +9,4 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
9 9
                             const char *dtb_filename,
10 10
                             void (*machine_cpu_reset)(MicroBlazeCPU *));
11 11
 
12
-#endif /* __MICROBLAZE_BOOT __ */
12
+#endif /* MICROBLAZE_BOOT_H */

+ 4
- 3
hw/net/fsl_etsec/etsec.h View File

@@ -21,8 +21,9 @@
21 21
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22 22
  * THE SOFTWARE.
23 23
  */
24
-#ifndef _ETSEC_H_
25
-#define _ETSEC_H_
24
+
25
+#ifndef ETSEC_H
26
+#define ETSEC_H
26 27
 
27 28
 #include "hw/qdev.h"
28 29
 #include "hw/sysbus.h"
@@ -173,4 +174,4 @@ void etsec_write_miim(eTSEC          *etsec,
173 174
 
174 175
 void etsec_miim_link_status(eTSEC *etsec, NetClientState *nc);
175 176
 
176
-#endif /* ! _ETSEC_H_ */
177
+#endif /* ETSEC_H */

+ 3
- 3
hw/net/fsl_etsec/registers.h View File

@@ -21,9 +21,9 @@
21 21
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22 22
  * THE SOFTWARE.
23 23
  */
24
-#ifndef _ETSEC_REGISTERS_H_
25
-#define _ETSEC_REGISTERS_H_
26 24
 
25
+#ifndef ETSEC_REGISTERS_H
26
+#define ETSEC_REGISTERS_H
27 27
 
28 28
 enum eTSEC_Register_Access_Type {
29 29
     ACC_RW      = 1,            /* Read/Write */
@@ -316,4 +316,4 @@ extern const eTSEC_Register_Definition eTSEC_registers_def[];
316 316
 #define TMR_ETTS2_H  (0xEA8 / 4)
317 317
 #define TMR_ETTS2_L  (0xEAC / 4)
318 318
 
319
-#endif /* ! _ETSEC_REGISTERS_H_ */
319
+#endif /* ETSEC_REGISTERS_H */

+ 3
- 3
hw/net/rocker/rocker.h View File

@@ -16,8 +16,8 @@
16 16
  * GNU General Public License for more details.
17 17
  */
18 18
 
19
-#ifndef _ROCKER_H_
20
-#define _ROCKER_H_
19
+#ifndef ROCKER_H
20
+#define ROCKER_H
21 21
 
22 22
 #include "qemu/sockets.h"
23 23
 
@@ -81,4 +81,4 @@ int rx_produce(World *world, uint32_t pport,
81 81
 int rocker_port_eg(Rocker *r, uint32_t pport,
82 82
                    const struct iovec *iov, int iovcnt);
83 83
 
84
-#endif /* _ROCKER_H_ */
84
+#endif /* ROCKER_H */

+ 2
- 3
hw/net/rocker/rocker_desc.h View File

@@ -14,9 +14,8 @@
14 14
  * GNU General Public License for more details.
15 15
  */
16 16
 
17
-
18
-#ifndef _ROCKER_DESC_H_
19
-#define _ROCKER_DESC_H_
17
+#ifndef ROCKER_DESC_H
18
+#define ROCKER_DESC_H
20 19
 
21 20
 #include "rocker_hw.h"
22 21
 

+ 3
- 3
hw/net/rocker/rocker_fp.h View File

@@ -14,8 +14,8 @@
14 14
  * GNU General Public License for more details.
15 15
  */
16 16
 
17
-#ifndef _ROCKER_FP_H_
18
-#define _ROCKER_FP_H_
17
+#ifndef ROCKER_FP_H
18
+#define ROCKER_FP_H
19 19
 
20 20
 #include "net/net.h"
21 21
 #include "qemu/iov.h"
@@ -51,4 +51,4 @@ FpPort *fp_port_alloc(Rocker *r, char *sw_name,
51 51
 void fp_port_free(FpPort *port);
52 52
 void fp_port_reset(FpPort *port);
53 53
 
54
-#endif /* _ROCKER_FP_H_ */
54
+#endif /* ROCKER_FP_H */

+ 3
- 3
hw/net/rocker/rocker_hw.h View File

@@ -6,8 +6,8 @@
6 6
  *
7 7
  */
8 8
 
9
-#ifndef _ROCKER_HW_
10
-#define _ROCKER_HW_
9
+#ifndef ROCKER_HW_H
10
+#define ROCKER_HW_H
11 11
 
12 12
 #define __le16 uint16_t
13 13
 #define __le32 uint32_t
@@ -490,4 +490,4 @@ enum rocker_of_dpa_overlay_type {
490 490
  */
491 491
 #define ROCKER_CONTROL_RESET            (1 << 0)
492 492
 
493
-#endif /* _ROCKER_HW_ */
493
+#endif /* ROCKER_HW_H */

+ 3
- 3
hw/net/rocker/rocker_of_dpa.h View File

@@ -14,9 +14,9 @@
14 14
  * GNU General Public License for more details.
15 15
  */
16 16
 
17
-#ifndef _ROCKER_OF_DPA_H_
18
-#define _ROCKER_OF_DPA_H_
17
+#ifndef ROCKER_OF_DPA_H
18
+#define ROCKER_OF_DPA_H
19 19
 
20 20
 World *of_dpa_world_alloc(Rocker *r);
21 21
 
22
-#endif /* _ROCKER_OF_DPA_H_ */
22
+#endif /* ROCKER_OF_DPA_H */

+ 2
- 2
hw/net/rocker/rocker_tlv.h View File

@@ -14,8 +14,8 @@
14 14
  * GNU General Public License for more details.
15 15
  */
16 16
 
17
-#ifndef _ROCKER_TLV_H_
18
-#define _ROCKER_TLV_H_
17
+#ifndef ROCKER_TLV_H
18
+#define ROCKER_TLV_H
19 19
 
20 20
 #define ROCKER_TLV_ALIGNTO 8U
21 21
 #define ROCKER_TLV_ALIGN(len) \

+ 3
- 3
hw/net/rocker/rocker_world.h View File

@@ -14,8 +14,8 @@
14 14
  * GNU General Public License for more details.
15 15
  */
16 16
 
17
-#ifndef _ROCKER_WORLD_H_
18
-#define _ROCKER_WORLD_H_
17
+#ifndef ROCKER_WORLD_H
18
+#define ROCKER_WORLD_H
19 19
 
20 20
 #include "rocker_hw.h"
21 21
 
@@ -58,4 +58,4 @@ const char *world_name(World *world);
58 58
 
59 59
 World *rocker_get_world(Rocker *r, enum rocker_world_type type);
60 60
 
61
-#endif /* _ROCKER_WORLD_H_ */
61
+#endif /* ROCKER_WORLD_H */

+ 2
- 2
hw/net/vmxnet3.h View File

@@ -15,8 +15,8 @@
15 15
  *
16 16
  */
17 17
 
18
-#ifndef _QEMU_VMXNET3_H
19
-#define _QEMU_VMXNET3_H
18
+#ifndef QEMU_VMXNET3_H
19
+#define QEMU_VMXNET3_H
20 20
 
21 21
 #define VMXNET3_DEVICE_MAX_TX_QUEUES 8
22 22
 #define VMXNET3_DEVICE_MAX_RX_QUEUES 8   /* Keep this value as a power of 2 */

+ 3
- 3
hw/net/vmxnet_debug.h View File

@@ -15,8 +15,8 @@
15 15
  *
16 16
  */
17 17
 
18
-#ifndef _QEMU_VMXNET_DEBUG_H
19
-#define _QEMU_VMXNET_DEBUG_H
18
+#ifndef QEMU_VMXNET_DEBUG_H
19
+#define QEMU_VMXNET_DEBUG_H
20 20
 
21 21
 #define VMXNET_DEVICE_NAME "vmxnet3"
22 22
 
@@ -142,4 +142,4 @@
142 142
         }                                                                     \
143 143
     } while (0)
144 144
 
145
-#endif /* _QEMU_VMXNET3_DEBUG_H  */
145
+#endif /* QEMU_VMXNET_DEBUG_H */

+ 4
- 3
hw/ppc/mac.h View File

@@ -22,8 +22,9 @@
22 22
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23 23
  * THE SOFTWARE.
24 24
  */
25
-#if !defined(__PPC_MAC_H__)
26
-#define __PPC_MAC_H__
25
+
26
+#ifndef PPC_MAC_H
27
+#define PPC_MAC_H
27 28
 
28 29
 #include "exec/memory.h"
29 30
 #include "hw/sysbus.h"
@@ -184,4 +185,4 @@ typedef struct MacIONVRAMState {
184 185
 } MacIONVRAMState;
185 186
 
186 187
 void pmac_format_nvram_partition (MacIONVRAMState *nvr, int len);
187
-#endif /* !defined(__PPC_MAC_H__) */
188
+#endif /* PPC_MAC_H */

+ 3
- 3
hw/sh4/sh7750_regnames.h View File

@@ -1,6 +1,6 @@
1
-#ifndef _SH7750_REGNAMES_H
2
-#define _SH7750_REGNAMES_H
1
+#ifndef SH7750_REGNAMES_H
2
+#define SH7750_REGNAMES_H
3 3
 
4 4
 const char *regname(uint32_t addr);
5 5
 
6
-#endif				/* _SH7750_REGNAMES_H */
6
+#endif /* SH7750_REGNAMES_H */

+ 2
- 2
hw/sh4/sh7750_regs.h View File

@@ -16,8 +16,8 @@
16 16
  * @(#) sh7750_regs.h,v 1.2.4.1 2003/09/04 18:46:00 joel Exp
17 17
  */
18 18
 
19
-#ifndef __SH7750_REGS_H__
20
-#define __SH7750_REGS_H__
19
+#ifndef SH7750_REGS_H
20
+#define SH7750_REGS_H
21 21
 
22 22
 /*
23 23
  * All register has 2 addresses: in 0xff000000 - 0xffffffff (P4 address)  and

+ 2
- 2
hw/xtensa/bootparam.h View File

@@ -1,5 +1,5 @@
1
-#ifndef HW_XTENSA_BOOTPARAM
2
-#define HW_XTENSA_BOOTPARAM
1
+#ifndef HW_XTENSA_BOOTPARAM_H
2
+#define HW_XTENSA_BOOTPARAM_H
3 3
 
4 4
 #define BP_TAG_COMMAND_LINE     0x1001  /* command line (0-terminated string)*/
5 5
 #define BP_TAG_INITRD           0x1002  /* ramdisk addr and size (bp_meminfo) */

+ 3
- 3
include/crypto/afsplit.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QCRYPTO_AFSPLIT_H__
22
-#define QCRYPTO_AFSPLIT_H__
21
+#ifndef QCRYPTO_AFSPLIT_H
22
+#define QCRYPTO_AFSPLIT_H
23 23
 
24 24
 #include "crypto/hash.h"
25 25
 
@@ -132,4 +132,4 @@ int qcrypto_afsplit_decode(QCryptoHashAlgorithm hash,
132 132
                            uint8_t *out,
133 133
                            Error **errp);
134 134
 
135
-#endif /* QCRYPTO_AFSPLIT_H__ */
135
+#endif /* QCRYPTO_AFSPLIT_H */

+ 3
- 3
include/crypto/block.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QCRYPTO_BLOCK_H__
22
-#define QCRYPTO_BLOCK_H__
21
+#ifndef QCRYPTO_BLOCK_H
22
+#define QCRYPTO_BLOCK_H
23 23
 
24 24
 #include "crypto/cipher.h"
25 25
 #include "crypto/ivgen.h"
@@ -229,4 +229,4 @@ uint64_t qcrypto_block_get_payload_offset(QCryptoBlock *block);
229 229
  */
230 230
 void qcrypto_block_free(QCryptoBlock *block);
231 231
 
232
-#endif /* QCRYPTO_BLOCK_H__ */
232
+#endif /* QCRYPTO_BLOCK_H */

+ 3
- 3
include/crypto/cipher.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QCRYPTO_CIPHER_H__
22
-#define QCRYPTO_CIPHER_H__
21
+#ifndef QCRYPTO_CIPHER_H
22
+#define QCRYPTO_CIPHER_H
23 23
 
24 24
 #include "qapi-types.h"
25 25
 
@@ -230,4 +230,4 @@ int qcrypto_cipher_setiv(QCryptoCipher *cipher,
230 230
                          const uint8_t *iv, size_t niv,
231 231
                          Error **errp);
232 232
 
233
-#endif /* QCRYPTO_CIPHER_H__ */
233
+#endif /* QCRYPTO_CIPHER_H */

+ 3
- 3
include/crypto/hash.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QCRYPTO_HASH_H__
22
-#define QCRYPTO_HASH_H__
21
+#ifndef QCRYPTO_HASH_H
22
+#define QCRYPTO_HASH_H
23 23
 
24 24
 #include "qapi-types.h"
25 25
 
@@ -189,4 +189,4 @@ int qcrypto_hash_base64(QCryptoHashAlgorithm alg,
189 189
                         char **base64,
190 190
                         Error **errp);
191 191
 
192
-#endif /* QCRYPTO_HASH_H__ */
192
+#endif /* QCRYPTO_HASH_H */

+ 3
- 3
include/crypto/init.h View File

@@ -18,9 +18,9 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QCRYPTO_INIT_H__
22
-#define QCRYPTO_INIT_H__
21
+#ifndef QCRYPTO_INIT_H
22
+#define QCRYPTO_INIT_H
23 23
 
24 24
 int qcrypto_init(Error **errp);
25 25
 
26
-#endif /* QCRYPTO_INIT_H__ */
26
+#endif /* QCRYPTO_INIT_H */

+ 3
- 3
include/crypto/ivgen.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QCRYPTO_IVGEN_H__
22
-#define QCRYPTO_IVGEN_H__
21
+#ifndef QCRYPTO_IVGEN_H
22
+#define QCRYPTO_IVGEN_H
23 23
 
24 24
 #include "crypto/cipher.h"
25 25
 #include "crypto/hash.h"
@@ -203,4 +203,4 @@ QCryptoHashAlgorithm qcrypto_ivgen_get_hash(QCryptoIVGen *ivgen);
203 203
  */
204 204
 void qcrypto_ivgen_free(QCryptoIVGen *ivgen);
205 205
 
206
-#endif /* QCRYPTO_IVGEN_H__ */
206
+#endif /* QCRYPTO_IVGEN_H */

+ 3
- 3
include/crypto/pbkdf.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QCRYPTO_PBKDF_H__
22
-#define QCRYPTO_PBKDF_H__
21
+#ifndef QCRYPTO_PBKDF_H
22
+#define QCRYPTO_PBKDF_H
23 23
 
24 24
 #include "crypto/hash.h"
25 25
 
@@ -149,4 +149,4 @@ int qcrypto_pbkdf2_count_iters(QCryptoHashAlgorithm hash,
149 149
                                const uint8_t *salt, size_t nsalt,
150 150
                                Error **errp);
151 151
 
152
-#endif /* QCRYPTO_PBKDF_H__ */
152
+#endif /* QCRYPTO_PBKDF_H */

+ 3
- 3
include/crypto/random.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QCRYPTO_RANDOM_H__
22
-#define QCRYPTO_RANDOM_H__
21
+#ifndef QCRYPTO_RANDOM_H
22
+#define QCRYPTO_RANDOM_H
23 23
 
24 24
 #include "qemu-common.h"
25 25
 #include "qapi/error.h"
@@ -41,4 +41,4 @@ int qcrypto_random_bytes(uint8_t *buf,
41 41
                          Error **errp);
42 42
 
43 43
 
44
-#endif /* QCRYPTO_RANDOM_H__ */
44
+#endif /* QCRYPTO_RANDOM_H */

+ 3
- 3
include/crypto/secret.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QCRYPTO_SECRET_H__
22
-#define QCRYPTO_SECRET_H__
21
+#ifndef QCRYPTO_SECRET_H
22
+#define QCRYPTO_SECRET_H
23 23
 
24 24
 #include "qom/object.h"
25 25
 
@@ -143,4 +143,4 @@ extern char *qcrypto_secret_lookup_as_utf8(const char *secretid,
143 143
 extern char *qcrypto_secret_lookup_as_base64(const char *secretid,
144 144
                                              Error **errp);
145 145
 
146
-#endif /* QCRYPTO_SECRET_H__ */
146
+#endif /* QCRYPTO_SECRET_H */

+ 3
- 4
include/crypto/xts.h View File

@@ -23,9 +23,8 @@
23 23
  *
24 24
  */
25 25
 
26
-
27
-#ifndef QCRYPTO_XTS_H_
28
-#define QCRYPTO_XTS_H_
26
+#ifndef QCRYPTO_XTS_H
27
+#define QCRYPTO_XTS_H
29 28
 
30 29
 #include "qemu-common.h"
31 30
 #include "qapi/error.h"
@@ -83,4 +82,4 @@ void xts_encrypt(const void *datactx,
83 82
                  const uint8_t *src);
84 83
 
85 84
 
86
-#endif /* QCRYPTO_XTS_H_ */
85
+#endif /* QCRYPTO_XTS_H */

+ 3
- 3
include/disas/disas.h View File

@@ -1,5 +1,5 @@
1
-#ifndef _QEMU_DISAS_H
2
-#define _QEMU_DISAS_H
1
+#ifndef QEMU_DISAS_H
2
+#define QEMU_DISAS_H
3 3
 
4 4
 #include "qemu-common.h"
5 5
 
@@ -42,4 +42,4 @@ struct syminfo {
42 42
 /* Filled in by elfload.c.  Simplistic, but will do for now. */
43 43
 extern struct syminfo *syminfos;
44 44
 
45
-#endif /* _QEMU_DISAS_H */
45
+#endif /* QEMU_DISAS_H */

+ 3
- 4
include/elf.h View File

@@ -1,6 +1,5 @@
1
-#ifndef _QEMU_ELF_H
2
-#define _QEMU_ELF_H
3
-
1
+#ifndef QEMU_ELF_H
2
+#define QEMU_ELF_H
4 3
 
5 4
 /* 32-bit ELF base types. */
6 5
 typedef uint32_t Elf32_Addr;
@@ -1573,4 +1572,4 @@ struct elf32_fdpic_loadmap {
1573 1572
 #endif /* ELF_CLASS */
1574 1573
 
1575 1574
 
1576
-#endif /* _QEMU_ELF_H */
1575
+#endif /* QEMU_ELF_H */

+ 2
- 2
include/exec/exec-all.h View File

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

+ 2
- 2
include/exec/tb-context.h View File

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

+ 4
- 3
include/exec/tb-hash-xx.h View File

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

+ 2
- 2
include/exec/tb-hash.h View File

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

+ 3
- 4
include/hw/arm/exynos4210.h View File

@@ -22,9 +22,8 @@
22 22
  *
23 23
  */
24 24
 
25
-
26
-#ifndef EXYNOS4210_H_
27
-#define EXYNOS4210_H_
25
+#ifndef EXYNOS4210_H
26
+#define EXYNOS4210_H
28 27
 
29 28
 #include "qemu-common.h"
30 29
 #include "exec/memory.h"
@@ -135,4 +134,4 @@ DeviceState *exynos4210_uart_create(hwaddr addr,
135 134
                                     CharDriverState *chr,
136 135
                                     qemu_irq irq);
137 136
 
138
-#endif /* EXYNOS4210_H_ */
137
+#endif /* EXYNOS4210_H */

+ 3
- 3
include/hw/gpio/imx_gpio.h View File

@@ -17,8 +17,8 @@
17 17
  * with this program; if not, see <http://www.gnu.org/licenses/>.
18 18
  */
19 19
 
20
-#ifndef __IMX_GPIO_H_
21
-#define __IMX_GPIO_H_
20
+#ifndef IMX_GPIO_H
21
+#define IMX_GPIO_H
22 22
 
23 23
 #include "hw/sysbus.h"
24 24
 
@@ -60,4 +60,4 @@ typedef struct IMXGPIOState {
60 60
     qemu_irq output[IMX_GPIO_PIN_COUNT];
61 61
 } IMXGPIOState;
62 62
 
63
-#endif /* __IMX_GPIO_H_ */
63
+#endif /* IMX_GPIO_H */

+ 3
- 3
include/hw/i2c/i2c-ddc.h View File

@@ -16,8 +16,8 @@
16 16
  *  with this program; if not, see <http://www.gnu.org/licenses/>.
17 17
  */
18 18
 
19
-#ifndef I2C_DDC
20
-#define I2C_DDC
19
+#ifndef I2C_DDC_H
20
+#define I2C_DDC_H
21 21
 
22 22
 /* A simple I2C slave which just returns the contents of its EDID blob. */
23 23
 
@@ -35,4 +35,4 @@ typedef struct I2CDDCState I2CDDCState;
35 35
 #define TYPE_I2CDDC "i2c-ddc"
36 36
 #define I2CDDC(obj) OBJECT_CHECK(I2CDDCState, (obj), TYPE_I2CDDC)
37 37
 
38
-#endif /* !I2C_DDC */
38
+#endif /* I2C_DDC_H */

+ 3
- 3
include/hw/i2c/imx_i2c.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef __IMX_I2C_H_
22
-#define __IMX_I2C_H_
21
+#ifndef IMX_I2C_H
22
+#define IMX_I2C_H
23 23
 
24 24
 #include "hw/sysbus.h"
25 25
 
@@ -84,4 +84,4 @@ typedef struct IMXI2CState {
84 84
     uint16_t i2dr_write;
85 85
 } IMXI2CState;
86 86
 
87
-#endif /* __IMX_I2C_H_ */
87
+#endif /* IMX_I2C_H */

+ 3
- 3
include/hw/input/adb.h View File

@@ -23,8 +23,8 @@
23 23
  * THE SOFTWARE.
24 24
  */
25 25
 
26
-#if !defined(__ADB_H__)
27
-#define __ADB_H__
26
+#ifndef ADB_H
27
+#define ADB_H
28 28
 
29 29
 #include "hw/qdev.h"
30 30
 
@@ -84,4 +84,4 @@ int adb_poll(ADBBusState *s, uint8_t *buf_out, uint16_t poll_mask);
84 84
 #define TYPE_ADB_KEYBOARD "adb-keyboard"
85 85
 #define TYPE_ADB_MOUSE "adb-mouse"
86 86
 
87
-#endif /* !defined(__ADB_H__) */
87
+#endif /* ADB_H */

+ 3
- 3
include/hw/intc/mips_gic.h View File

@@ -8,8 +8,8 @@
8 8
  *
9 9
  */
10 10
 
11
-#ifndef _MIPS_GIC_H
12
-#define _MIPS_GIC_H
11
+#ifndef MIPS_GIC_H
12
+#define MIPS_GIC_H
13 13
 
14 14
 #include "hw/timer/mips_gictimer.h"
15 15
 #include "cpu.h"
@@ -213,4 +213,4 @@ struct MIPSGICState {
213 213
     int32_t num_irq;
214 214
 };
215 215
 
216
-#endif /* _MIPS_GIC_H */
216
+#endif /* MIPS_GIC_H */

+ 3
- 3
include/hw/ppc/openpic.h View File

@@ -1,5 +1,5 @@
1
-#if !defined(__OPENPIC_H__)
2
-#define __OPENPIC_H__
1
+#ifndef OPENPIC_H
2
+#define OPENPIC_H
3 3
 
4 4
 #include "qemu-common.h"
5 5
 #include "hw/qdev-core.h"
@@ -30,4 +30,4 @@ enum {
30 30
 #define TYPE_KVM_OPENPIC "kvm-openpic"
31 31
 int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs);
32 32
 
33
-#endif /* __OPENPIC_H__ */
33
+#endif /* OPENPIC_H */

+ 3
- 3
include/hw/ppc/spapr.h View File

@@ -1,5 +1,5 @@
1
-#if !defined(__HW_SPAPR_H__)
2
-#define __HW_SPAPR_H__
1
+#ifndef HW_SPAPR_H
2
+#define HW_SPAPR_H
3 3
 
4 4
 #include "sysemu/dma.h"
5 5
 #include "hw/boards.h"
@@ -648,4 +648,4 @@ int spapr_rng_populate_dt(void *fdt);
648 648
 #define SPAPR_LMB_FLAGS_DRC_INVALID 0x00000020
649 649
 #define SPAPR_LMB_FLAGS_RESERVED 0x00000080
650 650
 
651
-#endif /* !defined (__HW_SPAPR_H__) */
651
+#endif /* HW_SPAPR_H */

+ 4
- 3
include/hw/ppc/spapr_drc.h View File

@@ -9,8 +9,9 @@
9 9
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
10 10
  * See the COPYING file in the top-level directory.
11 11
  */
12
-#if !defined(__HW_SPAPR_DRC_H__)
13
-#define __HW_SPAPR_DRC_H__
12
+
13
+#ifndef HW_SPAPR_DRC_H
14
+#define HW_SPAPR_DRC_H
14 15
 
15 16
 #include <libfdt.h>
16 17
 #include "qom/object.h"
@@ -202,4 +203,4 @@ sPAPRDRConnector *spapr_dr_connector_by_id(sPAPRDRConnectorType type,
202 203
 int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner,
203 204
                           uint32_t drc_type_mask);
204 205
 
205
-#endif /* __HW_SPAPR_DRC_H__ */
206
+#endif /* HW_SPAPR_DRC_H */

+ 4
- 3
include/hw/ppc/spapr_vio.h View File

@@ -1,5 +1,6 @@
1
-#ifndef _HW_SPAPR_VIO_H
2
-#define _HW_SPAPR_VIO_H
1
+#ifndef HW_SPAPR_VIO_H
2
+#define HW_SPAPR_VIO_H
3
+
3 4
 /*
4 5
  * QEMU sPAPR VIO bus definitions
5 6
  *
@@ -145,4 +146,4 @@ extern const VMStateDescription vmstate_spapr_vio;
145 146
 
146 147
 void spapr_vio_set_bypass(VIOsPAPRDevice *dev, bool bypass);
147 148
 
148
-#endif /* _HW_SPAPR_VIO_H */
149
+#endif /* HW_SPAPR_VIO_H */

+ 4
- 3
include/hw/ppc/xics.h View File

@@ -24,8 +24,9 @@
24 24
  * THE SOFTWARE.
25 25
  *
26 26
  */
27
-#if !defined(__XICS_H__)
28
-#define __XICS_H__
27
+
28
+#ifndef XICS_H
29
+#define XICS_H
29 30
 
30 31
 #include "hw/sysbus.h"
31 32
 
@@ -196,4 +197,4 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool lsi);
196 197
 
197 198
 int xics_find_source(XICSState *icp, int irq);
198 199
 
199
-#endif /* __XICS_H__ */
200
+#endif /* XICS_H */

+ 3
- 3
include/hw/s390x/ebcdic.h View File

@@ -9,8 +9,8 @@
9 9
  *
10 10
  */
11 11
 
12
-#ifndef EBCDIC_H_
13
-#define EBCDIC_H_
12
+#ifndef EBCDIC_H
13
+#define EBCDIC_H
14 14
 
15 15
 /* EBCDIC handling */
16 16
 static const uint8_t ebcdic2ascii[] = {
@@ -101,4 +101,4 @@ static inline void ascii_put(uint8_t *p, const char *ebcdic, int len)
101 101
     }
102 102
 }
103 103
 
104
-#endif /* EBCDIC_H_ */
104
+#endif /* EBCDIC_H */

+ 3
- 3
include/hw/s390x/s390_flic.h View File

@@ -10,8 +10,8 @@
10 10
  * directory.
11 11
  */
12 12
 
13
-#ifndef __HW_S390_FLIC_H
14
-#define __HW_S390_FLIC_H
13
+#ifndef HW_S390_FLIC_H
14
+#define HW_S390_FLIC_H
15 15
 
16 16
 #include "hw/sysbus.h"
17 17
 #include "hw/s390x/adapter.h"
@@ -78,4 +78,4 @@ static inline DeviceState *s390_flic_kvm_create(void)
78 78
 }
79 79
 #endif
80 80
 
81
-#endif /* __HW_S390_FLIC_H */
81
+#endif /* HW_S390_FLIC_H */

+ 3
- 3
include/hw/s390x/storage-keys.h View File

@@ -9,8 +9,8 @@
9 9
  * directory.
10 10
  */
11 11
 
12
-#ifndef __S390_STORAGE_KEYS_H
13
-#define __S390_STORAGE_KEYS_H
12
+#ifndef S390_STORAGE_KEYS_H
13
+#define S390_STORAGE_KEYS_H
14 14
 
15 15
 #include "hw/qdev.h"
16 16
 #include "monitor/monitor.h"
@@ -57,4 +57,4 @@ S390SKeysState *s390_get_skeys_device(void);
57 57
 void hmp_dump_skeys(Monitor *mon, const QDict *qdict);
58 58
 void hmp_info_skeys(Monitor *mon, const QDict *qdict);
59 59
 
60
-#endif /* __S390_STORAGE_KEYS_H */
60
+#endif /* S390_STORAGE_KEYS_H */

+ 4
- 3
include/hw/sd/sd.h View File

@@ -26,8 +26,9 @@
26 26
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 27
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 28
  */
29
-#ifndef __hw_sd_h
30
-#define __hw_sd_h		1
29
+
30
+#ifndef HW_SD_H
31
+#define HW_SD_H
31 32
 
32 33
 #include "hw/qdev.h"
33 34
 
@@ -144,4 +145,4 @@ bool sdbus_get_readonly(SDBus *sd);
144 145
 void sdbus_set_inserted(SDBus *sd, bool inserted);
145 146
 void sdbus_set_readonly(SDBus *sd, bool inserted);
146 147
 
147
-#endif	/* __hw_sd_h */
148
+#endif /* HW_SD_H */

+ 3
- 3
include/hw/sh4/sh_intc.h View File

@@ -1,5 +1,5 @@
1
-#ifndef __SH_INTC_H__
2
-#define __SH_INTC_H__
1
+#ifndef SH_INTC_H
2
+#define SH_INTC_H
3 3
 
4 4
 #include "qemu-common.h"
5 5
 #include "hw/irq.h"
@@ -80,4 +80,4 @@ int sh_intc_init(MemoryRegion *sysmem,
80 80
 
81 81
 void sh_intc_set_irl(void *opaque, int n, int level);
82 82
 
83
-#endif /* __SH_INTC_H__ */
83
+#endif /* SH_INTC_H */

+ 3
- 3
include/hw/sparc/grlib.h View File

@@ -22,8 +22,8 @@
22 22
  * THE SOFTWARE.
23 23
  */
24 24
 
25
-#ifndef _GRLIB_H_
26
-#define _GRLIB_H_
25
+#ifndef GRLIB_H
26
+#define GRLIB_H
27 27
 
28 28
 #include "hw/qdev.h"
29 29
 #include "hw/sysbus.h"
@@ -117,4 +117,4 @@ DeviceState *grlib_apbuart_create(hwaddr  base,
117 117
     return dev;
118 118
 }
119 119
 
120
-#endif /* ! _GRLIB_H_ */
120
+#endif /* GRLIB_H */

+ 3
- 3
include/hw/timer/mips_gictimer.h View File

@@ -7,8 +7,8 @@
7 7
  *
8 8
  */
9 9
 
10
-#ifndef _MIPS_GICTIMER_H_
11
-#define _MIPS_GICTIMER_H_
10
+#ifndef MIPS_GICTIMER_H
11
+#define MIPS_GICTIMER_H
12 12
 
13 13
 typedef struct MIPSGICTimerVPState MIPSGICTimerVPState;
14 14
 typedef struct MIPSGICTimerState MIPSGICTimerState;
@@ -43,4 +43,4 @@ void mips_gictimer_stop_count(MIPSGICTimerState *gic);
43 43
 MIPSGICTimerState *mips_gictimer_init(void *opaque, uint32_t nvps,
44 44
                                       MIPSGICTimerCB *cb);
45 45
 
46
-#endif /* _MIPS_GICTIMER_H_ */
46
+#endif /* MIPS_GICTIMER_H */

+ 3
- 4
include/hw/virtio/vhost-backend.h View File

@@ -8,9 +8,8 @@
8 8
  *
9 9
  */
10 10
 
11
-#ifndef VHOST_BACKEND_H_
12
-#define VHOST_BACKEND_H_
13
-
11
+#ifndef VHOST_BACKEND_H
12
+#define VHOST_BACKEND_H
14 13
 
15 14
 typedef enum VhostBackendType {
16 15
     VHOST_BACKEND_TYPE_NONE = 0,
@@ -110,4 +109,4 @@ extern const VhostOps user_ops;
110 109
 int vhost_set_backend_type(struct vhost_dev *dev,
111 110
                            VhostBackendType backend_type);
112 111
 
113
-#endif /* VHOST_BACKEND_H_ */
112
+#endif /* VHOST_BACKEND_H */

+ 5
- 3
include/hw/virtio/virtio-access.h View File

@@ -12,8 +12,10 @@
12 12
  * (at your option) any later version.
13 13
  *
14 14
  */
15
-#ifndef _QEMU_VIRTIO_ACCESS_H
16
-#define _QEMU_VIRTIO_ACCESS_H
15
+
16
+#ifndef QEMU_VIRTIO_ACCESS_H
17
+#define QEMU_VIRTIO_ACCESS_H
18
+
17 19
 #include "hw/virtio/virtio.h"
18 20
 #include "exec/address-spaces.h"
19 21
 
@@ -175,4 +177,4 @@ static inline void virtio_tswap64s(VirtIODevice *vdev, uint64_t *s)
175 177
 {
176 178
     *s = virtio_tswap64(vdev, *s);
177 179
 }
178
-#endif /* _QEMU_VIRTIO_ACCESS_H */
180
+#endif /* QEMU_VIRTIO_ACCESS_H */

+ 2
- 2
include/hw/virtio/virtio-balloon.h View File

@@ -12,8 +12,8 @@
12 12
  *
13 13
  */
14 14
 
15
-#ifndef _QEMU_VIRTIO_BALLOON_H
16
-#define _QEMU_VIRTIO_BALLOON_H
15
+#ifndef QEMU_VIRTIO_BALLOON_H
16
+#define QEMU_VIRTIO_BALLOON_H
17 17
 
18 18
 #include "standard-headers/linux/virtio_balloon.h"
19 19
 #include "hw/virtio/virtio.h"

+ 2
- 2
include/hw/virtio/virtio-blk.h View File

@@ -11,8 +11,8 @@
11 11
  *
12 12
  */
13 13
 
14
-#ifndef _QEMU_VIRTIO_BLK_H
15
-#define _QEMU_VIRTIO_BLK_H
14
+#ifndef QEMU_VIRTIO_BLK_H
15
+#define QEMU_VIRTIO_BLK_H
16 16
 
17 17
 #include "standard-headers/linux/virtio_blk.h"
18 18
 #include "hw/virtio/virtio.h"

+ 3
- 3
include/hw/virtio/virtio-input.h View File

@@ -1,5 +1,5 @@
1
-#ifndef _QEMU_VIRTIO_INPUT_H
2
-#define _QEMU_VIRTIO_INPUT_H
1
+#ifndef QEMU_VIRTIO_INPUT_H
2
+#define QEMU_VIRTIO_INPUT_H
3 3
 
4 4
 #include "ui/input.h"
5 5
 
@@ -105,4 +105,4 @@ void virtio_input_add_config(VirtIOInput *vinput,
105 105
 void virtio_input_idstr_config(VirtIOInput *vinput,
106 106
                                uint8_t select, const char *string);
107 107
 
108
-#endif /* _QEMU_VIRTIO_INPUT_H */
108
+#endif /* QEMU_VIRTIO_INPUT_H */

+ 2
- 2
include/hw/virtio/virtio-net.h View File

@@ -11,8 +11,8 @@
11 11
  *
12 12
  */
13 13
 
14
-#ifndef _QEMU_VIRTIO_NET_H
15
-#define _QEMU_VIRTIO_NET_H
14
+#ifndef QEMU_VIRTIO_NET_H
15
+#define QEMU_VIRTIO_NET_H
16 16
 
17 17
 #include "standard-headers/linux/virtio_net.h"
18 18
 #include "hw/virtio/virtio.h"

+ 2
- 2
include/hw/virtio/virtio-rng.h View File

@@ -9,8 +9,8 @@
9 9
  * top-level directory.
10 10
  */
11 11
 
12
-#ifndef _QEMU_VIRTIO_RNG_H
13
-#define _QEMU_VIRTIO_RNG_H
12
+#ifndef QEMU_VIRTIO_RNG_H
13
+#define QEMU_VIRTIO_RNG_H
14 14
 
15 15
 #include "sysemu/rng.h"
16 16
 #include "sysemu/rng-random.h"

+ 3
- 3
include/hw/virtio/virtio-scsi.h View File

@@ -11,8 +11,8 @@
11 11
  *
12 12
  */
13 13
 
14
-#ifndef _QEMU_VIRTIO_SCSI_H
15
-#define _QEMU_VIRTIO_SCSI_H
14
+#ifndef QEMU_VIRTIO_SCSI_H
15
+#define QEMU_VIRTIO_SCSI_H
16 16
 
17 17
 /* Override CDB/sense data size: they are dynamic (guest controlled) in QEMU */
18 18
 #define VIRTIO_SCSI_CDB_SIZE 0
@@ -141,4 +141,4 @@ void virtio_scsi_dataplane_start(VirtIOSCSI *s);
141 141
 void virtio_scsi_dataplane_stop(VirtIOSCSI *s);
142 142
 void virtio_scsi_dataplane_notify(VirtIODevice *vdev, VirtIOSCSIReq *req);
143 143
 
144
-#endif /* _QEMU_VIRTIO_SCSI_H */
144
+#endif /* QEMU_VIRTIO_SCSI_H */

+ 3
- 2
include/hw/virtio/virtio-serial.h View File

@@ -12,8 +12,9 @@
12 12
  * the COPYING file in the top-level directory.
13 13
  *
14 14
  */
15
-#ifndef _QEMU_VIRTIO_SERIAL_H
16
-#define _QEMU_VIRTIO_SERIAL_H
15
+
16
+#ifndef QEMU_VIRTIO_SERIAL_H
17
+#define QEMU_VIRTIO_SERIAL_H
17 18
 
18 19
 #include "standard-headers/linux/virtio_console.h"
19 20
 #include "hw/qdev.h"

+ 2
- 2
include/hw/virtio/virtio.h View File

@@ -11,8 +11,8 @@
11 11
  *
12 12
  */
13 13
 
14
-#ifndef _QEMU_VIRTIO_H
15
-#define _QEMU_VIRTIO_H
14
+#ifndef QEMU_VIRTIO_H
15
+#define QEMU_VIRTIO_H
16 16
 
17 17
 #include "hw/hw.h"
18 18
 #include "net/net.h"

+ 3
- 3
include/io/channel-buffer.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QIO_CHANNEL_BUFFER_H__
22
-#define QIO_CHANNEL_BUFFER_H__
21
+#ifndef QIO_CHANNEL_BUFFER_H
22
+#define QIO_CHANNEL_BUFFER_H
23 23
 
24 24
 #include "io/channel.h"
25 25
 
@@ -57,4 +57,4 @@ struct QIOChannelBuffer {
57 57
 QIOChannelBuffer *
58 58
 qio_channel_buffer_new(size_t capacity);
59 59
 
60
-#endif /* QIO_CHANNEL_BUFFER_H__ */
60
+#endif /* QIO_CHANNEL_BUFFER_H */

+ 3
- 3
include/io/channel-command.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QIO_CHANNEL_COMMAND_H__
22
-#define QIO_CHANNEL_COMMAND_H__
21
+#ifndef QIO_CHANNEL_COMMAND_H
22
+#define QIO_CHANNEL_COMMAND_H
23 23
 
24 24
 #include "io/channel.h"
25 25
 
@@ -88,4 +88,4 @@ qio_channel_command_new_spawn(const char *const argv[],
88 88
                               Error **errp);
89 89
 
90 90
 
91
-#endif /* QIO_CHANNEL_COMMAND_H__ */
91
+#endif /* QIO_CHANNEL_COMMAND_H */

+ 3
- 3
include/io/channel-file.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QIO_CHANNEL_FILE_H__
22
-#define QIO_CHANNEL_FILE_H__
21
+#ifndef QIO_CHANNEL_FILE_H
22
+#define QIO_CHANNEL_FILE_H
23 23
 
24 24
 #include "io/channel.h"
25 25
 
@@ -90,4 +90,4 @@ qio_channel_file_new_path(const char *path,
90 90
                           mode_t mode,
91 91
                           Error **errp);
92 92
 
93
-#endif /* QIO_CHANNEL_FILE_H__ */
93
+#endif /* QIO_CHANNEL_FILE_H */

+ 3
- 3
include/io/channel-socket.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QIO_CHANNEL_SOCKET_H__
22
-#define QIO_CHANNEL_SOCKET_H__
21
+#ifndef QIO_CHANNEL_SOCKET_H
22
+#define QIO_CHANNEL_SOCKET_H
23 23
 
24 24
 #include "io/channel.h"
25 25
 #include "io/task.h"
@@ -248,4 +248,4 @@ qio_channel_socket_accept(QIOChannelSocket *ioc,
248 248
                           Error **errp);
249 249
 
250 250
 
251
-#endif /* QIO_CHANNEL_SOCKET_H__ */
251
+#endif /* QIO_CHANNEL_SOCKET_H */

+ 3
- 3
include/io/channel-tls.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QIO_CHANNEL_TLS_H__
22
-#define QIO_CHANNEL_TLS_H__
21
+#ifndef QIO_CHANNEL_TLS_H
22
+#define QIO_CHANNEL_TLS_H
23 23
 
24 24
 #include "io/channel.h"
25 25
 #include "io/task.h"
@@ -139,4 +139,4 @@ void qio_channel_tls_handshake(QIOChannelTLS *ioc,
139 139
 QCryptoTLSSession *
140 140
 qio_channel_tls_get_session(QIOChannelTLS *ioc);
141 141
 
142
-#endif /* QIO_CHANNEL_TLS_H__ */
142
+#endif /* QIO_CHANNEL_TLS_H */

+ 3
- 3
include/io/channel-util.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QIO_CHANNEL_UTIL_H__
22
-#define QIO_CHANNEL_UTIL_H__
21
+#ifndef QIO_CHANNEL_UTIL_H
22
+#define QIO_CHANNEL_UTIL_H
23 23
 
24 24
 #include "io/channel.h"
25 25
 
@@ -49,4 +49,4 @@
49 49
 QIOChannel *qio_channel_new_fd(int fd,
50 50
                                Error **errp);
51 51
 
52
-#endif /* QIO_CHANNEL_UTIL_H__ */
52
+#endif /* QIO_CHANNEL_UTIL_H */

+ 3
- 3
include/io/channel-watch.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QIO_CHANNEL_WATCH_H__
22
-#define QIO_CHANNEL_WATCH_H__
21
+#ifndef QIO_CHANNEL_WATCH_H
22
+#define QIO_CHANNEL_WATCH_H
23 23
 
24 24
 #include "io/channel.h"
25 25
 
@@ -87,4 +87,4 @@ GSource *qio_channel_create_fd_pair_watch(QIOChannel *ioc,
87 87
                                           int fdwrite,
88 88
                                           GIOCondition condition);
89 89
 
90
-#endif /* QIO_CHANNEL_WATCH_H__ */
90
+#endif /* QIO_CHANNEL_WATCH_H */

+ 3
- 3
include/io/channel-websock.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QIO_CHANNEL_WEBSOCK_H__
22
-#define QIO_CHANNEL_WEBSOCK_H__
21
+#ifndef QIO_CHANNEL_WEBSOCK_H
22
+#define QIO_CHANNEL_WEBSOCK_H
23 23
 
24 24
 #include "io/channel.h"
25 25
 #include "qemu/buffer.h"
@@ -105,4 +105,4 @@ void qio_channel_websock_handshake(QIOChannelWebsock *ioc,
105 105
                                    gpointer opaque,
106 106
                                    GDestroyNotify destroy);
107 107
 
108
-#endif /* QIO_CHANNEL_WEBSOCK_H__ */
108
+#endif /* QIO_CHANNEL_WEBSOCK_H */

+ 3
- 3
include/io/channel.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QIO_CHANNEL_H__
22
-#define QIO_CHANNEL_H__
21
+#ifndef QIO_CHANNEL_H
22
+#define QIO_CHANNEL_H
23 23
 
24 24
 #include "qemu-common.h"
25 25
 #include "qom/object.h"
@@ -502,4 +502,4 @@ void qio_channel_yield(QIOChannel *ioc,
502 502
 void qio_channel_wait(QIOChannel *ioc,
503 503
                       GIOCondition condition);
504 504
 
505
-#endif /* QIO_CHANNEL_H__ */
505
+#endif /* QIO_CHANNEL_H */

+ 3
- 3
include/io/task.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QIO_TASK_H__
22
-#define QIO_TASK_H__
21
+#ifndef QIO_TASK_H
22
+#define QIO_TASK_H
23 23
 
24 24
 #include "qemu-common.h"
25 25
 #include "qom/object.h"
@@ -252,4 +252,4 @@ void qio_task_abort(QIOTask *task,
252 252
  */
253 253
 Object *qio_task_get_source(QIOTask *task);
254 254
 
255
-#endif /* QIO_TASK_H__ */
255
+#endif /* QIO_TASK_H */

+ 3
- 2
include/libdecnumber/decContext.h View File

@@ -50,8 +50,9 @@
50 50
 /*								      */
51 51
 /* ------------------------------------------------------------------ */
52 52
 
53
-#if !defined(DECCONTEXT)
54
-  #define DECCONTEXT
53
+#ifndef DECCONTEXT_H
54
+#define DECCONTEXT_H
55
+
55 56
   #define DECCNAME     "decContext"			/* Short name */
56 57
   #define DECCFULLNAME "Decimal Context Descriptor"   /* Verbose name */
57 58
   #define DECCAUTHOR   "Mike Cowlishaw"		      /* Who to blame */

+ 3
- 2
include/libdecnumber/decNumber.h View File

@@ -32,8 +32,9 @@
32 32
 /* Decimal Number arithmetic module header			      */
33 33
 /* ------------------------------------------------------------------ */
34 34
 
35
-#if !defined(DECNUMBER)
36
-  #define DECNUMBER
35
+#ifndef DECNUMBER_H
36
+#define DECNUMBER_H
37
+
37 38
   #define DECNAME     "decNumber"			/* Short name */
38 39
   #define DECFULLNAME "Decimal Number Module"	      /* Verbose name */
39 40
   #define DECAUTHOR   "Mike Cowlishaw"		      /* Who to blame */

+ 3
- 2
include/libdecnumber/dpd/decimal128.h View File

@@ -32,8 +32,9 @@
32 32
 /* Decimal 128-bit format module header				      */
33 33
 /* ------------------------------------------------------------------ */
34 34
 
35
-#if !defined(DECIMAL128)
36
-  #define DECIMAL128
35
+#ifndef DECIMAL128_H
36
+#define DECIMAL128_H
37
+
37 38
   #define DEC128NAME	 "decimal128"		      /* Short name   */
38 39
   #define DEC128FULLNAME "Decimal 128-bit Number"     /* Verbose name */
39 40
   #define DEC128AUTHOR	 "Mike Cowlishaw"	      /* Who to blame */

+ 3
- 2
include/libdecnumber/dpd/decimal32.h View File

@@ -32,8 +32,9 @@
32 32
 /* Decimal 32-bit format module header				      */
33 33
 /* ------------------------------------------------------------------ */
34 34
 
35
-#if !defined(DECIMAL32)
36
-  #define DECIMAL32
35
+#ifndef DECIMAL32_H
36
+#define DECIMAL32_H
37
+
37 38
   #define DEC32NAME	"decimal32"		      /* Short name   */
38 39
   #define DEC32FULLNAME "Decimal 32-bit Number"	      /* Verbose name */
39 40
   #define DEC32AUTHOR	"Mike Cowlishaw"	      /* Who to blame */

+ 3
- 2
include/libdecnumber/dpd/decimal64.h View File

@@ -32,8 +32,9 @@
32 32
 /* Decimal 64-bit format module header				      */
33 33
 /* ------------------------------------------------------------------ */
34 34
 
35
-#if !defined(DECIMAL64)
36
-  #define DECIMAL64
35
+#ifndef DECIMAL64_H
36
+#define DECIMAL64_H
37
+
37 38
   #define DEC64NAME	"decimal64"		      /* Short name   */
38 39
   #define DEC64FULLNAME "Decimal 64-bit Number"	      /* Verbose name */
39 40
   #define DEC64AUTHOR	"Mike Cowlishaw"	      /* Who to blame */

+ 3
- 3
include/net/vhost-user.h View File

@@ -8,11 +8,11 @@
8 8
  *
9 9
  */
10 10
 
11
-#ifndef VHOST_USER_H_
12
-#define VHOST_USER_H_
11
+#ifndef VHOST_USER_H
12
+#define VHOST_USER_H
13 13
 
14 14
 struct vhost_net;
15 15
 struct vhost_net *vhost_user_get_vhost_net(NetClientState *nc);
16 16
 uint64_t vhost_user_get_acked_features(NetClientState *nc);
17 17
 
18
-#endif /* VHOST_USER_H_ */
18
+#endif /* VHOST_USER_H */

+ 3
- 3
include/qemu/acl.h View File

@@ -22,8 +22,8 @@
22 22
  * THE SOFTWARE.
23 23
  */
24 24
 
25
-#ifndef __QEMU_ACL_H__
26
-#define __QEMU_ACL_H__
25
+#ifndef QEMU_ACL_H
26
+#define QEMU_ACL_H
27 27
 
28 28
 #include "qemu/queue.h"
29 29
 
@@ -63,4 +63,4 @@ int qemu_acl_insert(qemu_acl *acl,
63 63
 int qemu_acl_remove(qemu_acl *acl,
64 64
 		    const char *match);
65 65
 
66
-#endif /* __QEMU_ACL_H__ */
66
+#endif /* QEMU_ACL_H */

+ 3
- 5
include/qemu/atomic.h View File

@@ -12,10 +12,8 @@
12 12
  * atomic primitive is meant to provide.
13 13
  */
14 14
 
15
-#ifndef __QEMU_ATOMIC_H
16
-#define __QEMU_ATOMIC_H 1
17
-
18
-
15
+#ifndef QEMU_ATOMIC_H
16
+#define QEMU_ATOMIC_H
19 17
 
20 18
 /* Compiler barrier */
21 19
 #define barrier()   ({ asm volatile("" ::: "memory"); (void)0; })
@@ -366,4 +364,4 @@
366 364
 #define atomic_or(ptr, n)      ((void) __sync_fetch_and_or(ptr, n))
367 365
 
368 366
 #endif /* __ATOMIC_RELAXED */
369
-#endif /* __QEMU_ATOMIC_H */
367
+#endif /* QEMU_ATOMIC_H */

+ 3
- 3
include/qemu/base64.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QEMU_BASE64_H__
22
-#define QEMU_BASE64_H__
21
+#ifndef QEMU_BASE64_H
22
+#define QEMU_BASE64_H
23 23
 
24 24
 #include "qemu-common.h"
25 25
 
@@ -55,4 +55,4 @@ uint8_t *qbase64_decode(const char *input,
55 55
                         Error **errp);
56 56
 
57 57
 
58
-#endif /* QEMU_BUFFER_H__ */
58
+#endif /* QEMU_BASE64_H */

+ 3
- 3
include/qemu/buffer.h View File

@@ -18,8 +18,8 @@
18 18
  *
19 19
  */
20 20
 
21
-#ifndef QEMU_BUFFER_H__
22
-#define QEMU_BUFFER_H__
21
+#ifndef QEMU_BUFFER_H
22
+#define QEMU_BUFFER_H
23 23
 
24 24
 #include "qemu-common.h"
25 25
 
@@ -158,4 +158,4 @@ void buffer_move_empty(Buffer *to, Buffer *from);
158 158
  */
159 159
 void buffer_move(Buffer *to, Buffer *from);
160 160
 
161
-#endif /* QEMU_BUFFER_H__ */
161
+#endif /* QEMU_BUFFER_H */

+ 2
- 2
include/qemu/mmap-alloc.h View File

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

+ 3
- 3
include/qemu/queue.h View File

@@ -37,8 +37,8 @@
37 37
  *      @(#)queue.h     8.5 (Berkeley) 8/20/94
38 38
  */
39 39
 
40
-#ifndef QEMU_SYS_QUEUE_H_
41
-#define QEMU_SYS_QUEUE_H_
40
+#ifndef QEMU_SYS_QUEUE_H
41
+#define QEMU_SYS_QUEUE_H
42 42
 
43 43
 /*
44 44
  * This file defines four types of data structures: singly-linked lists,
@@ -436,4 +436,4 @@ struct {                                                                \
436 436
 #define QTAILQ_PREV(elm, headname, field) \
437 437
         (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
438 438
 
439
-#endif  /* !QEMU_SYS_QUEUE_H_ */
439
+#endif /* QEMU_SYS_QUEUE_H */

+ 2
- 2
include/qemu/thread-posix.h View File

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

+ 2
- 2
include/qemu/thread-win32.h View File

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

+ 2
- 2
include/qemu/thread.h View File

@@ -1,5 +1,5 @@
1
-#ifndef __QEMU_THREAD_H
2
-#define __QEMU_THREAD_H 1
1
+#ifndef QEMU_THREAD_H
2
+#define QEMU_THREAD_H
3 3
 
4 4
 #include "qemu/processor.h"
5 5
 #include "qemu/atomic.h"

+ 2
- 2
include/sysemu/balloon.h View File

@@ -11,8 +11,8 @@
11 11
  *
12 12
  */
13 13
 
14
-#ifndef _QEMU_BALLOON_H
15
-#define _QEMU_BALLOON_H
14
+#ifndef QEMU_BALLOON_H
15
+#define QEMU_BALLOON_H
16 16
 
17 17
 #include "qapi-types.h"
18 18
 

+ 3
- 3
include/sysemu/device_tree.h View File

@@ -11,8 +11,8 @@
11 11
  *
12 12
  */
13 13
 
14
-#ifndef __DEVICE_TREE_H__
15
-#define __DEVICE_TREE_H__
14
+#ifndef DEVICE_TREE_H
15
+#define DEVICE_TREE_H
16 16
 
17 17
 void *create_device_tree(int *sizep);
18 18
 void *load_device_tree(const char *filename_path, int *sizep);
@@ -168,4 +168,4 @@ int qemu_fdt_setprop_sized_cells_from_array(void *fdt,
168 168
 #define FDT_PCI_RANGE_IOPORT               0x01000000
169 169
 #define FDT_PCI_RANGE_CONFIG               0x00000000
170 170
 
171
-#endif /* __DEVICE_TREE_H__ */
171
+#endif /* DEVICE_TREE_H */

+ 2
- 2
linux-user/arm/nwfpe/fpa11.h View File

@@ -18,8 +18,8 @@
18 18
     along with this program; if not, see <http://www.gnu.org/licenses/>.
19 19
 */
20 20
 
21
-#ifndef __FPA11_H__
22
-#define __FPA11_H__
21
+#ifndef FPA11_H
22
+#define FPA11_H
23 23
 
24 24
 #include "cpu.h"
25 25
 

+ 2
- 2
linux-user/arm/nwfpe/fpopcode.h View File

@@ -18,8 +18,8 @@
18 18
     along with this program; if not, see <http://www.gnu.org/licenses/>.
19 19
 */
20 20
 
21
-#ifndef __FPOPCODE_H__
22
-#define __FPOPCODE_H__
21
+#ifndef FPOPCODE_H
22
+#define FPOPCODE_H
23 23
 
24 24
 /*
25 25
 ARM Floating Point Instruction Classes

+ 2
- 2
linux-user/arm/nwfpe/fpsr.h View File

@@ -18,8 +18,8 @@
18 18
     along with this program; if not, see <http://www.gnu.org/licenses/>.
19 19
 */
20 20
 
21
-#ifndef __FPSR_H__
22
-#define __FPSR_H__
21
+#ifndef FPSR_H
22
+#define FPSR_H
23 23
 
24 24
 /*
25 25
 The FPSR is a 32 bit register consisting of 4 parts, each exactly

+ 3
- 2
linux-user/linux_loop.h View File

@@ -1,6 +1,7 @@
1 1
 /* Copied from 2.6.25 kernel headers to avoid problems on older hosts.  */
2
-#ifndef _LINUX_LOOP_H
3
-#define _LINUX_LOOP_H
2
+
3
+#ifndef LINUX_LOOP_H
4
+#define LINUX_LOOP_H
4 5
 
5 6
 /*
6 7
  * include/linux/loop.h

+ 2
- 2
linux-user/tilegx/syscall_nr.h View File

@@ -1,5 +1,5 @@
1
-#ifndef TILEGX_SYSCALL_NR
2
-#define TILEGX_SYSCALL_NR
1
+#ifndef TILEGX_SYSCALL_NR_H
2
+#define TILEGX_SYSCALL_NR_H
3 3
 
4 4
 /*
5 5
  * Copy from linux kernel asm-generic/unistd.h, which tilegx uses.

+ 2
- 2
qemu-options.h View File

@@ -25,8 +25,8 @@
25 25
  * THE SOFTWARE.
26 26
  */
27 27
 
28
-#ifndef _QEMU_OPTIONS_H_
29
-#define _QEMU_OPTIONS_H_
28
+#ifndef QEMU_OPTIONS_H
29
+#define QEMU_OPTIONS_H
30 30
 
31 31
 enum {
32 32
 #define QEMU_OPTIONS_GENERATE_ENUM

+ 2
- 2
slirp/if.h View File

@@ -5,8 +5,8 @@
5 5
  * terms and conditions of the copyright.
6 6
  */
7 7
 
8
-#ifndef _IF_H_
9
-#define _IF_H_
8
+#ifndef IF_H
9
+#define IF_H
10 10
 
11 11
 #define IF_COMPRESS	0x01	/* We want compression */
12 12
 #define IF_NOCOMPRESS	0x02	/* Do not do compression */

+ 2
- 2
slirp/ip.h View File

@@ -30,8 +30,8 @@
30 30
  * ip.h,v 1.3 1994/08/21 05:27:30 paul Exp
31 31
  */
32 32
 
33
-#ifndef _IP_H_
34
-#define _IP_H_
33
+#ifndef IP_H
34
+#define IP_H
35 35
 
36 36
 #ifdef HOST_WORDS_BIGENDIAN
37 37
 # undef NTOHL

+ 2
- 2
slirp/ip6.h View File

@@ -3,8 +3,8 @@
3 3
  * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne.
4 4
  */
5 5
 
6
-#ifndef SLIRP_IP6_H_
7
-#define SLIRP_IP6_H_
6
+#ifndef SLIRP_IP6_H
7
+#define SLIRP_IP6_H
8 8
 
9 9
 #include "net/eth.h"
10 10
 

+ 2
- 2
slirp/ip_icmp.h View File

@@ -30,8 +30,8 @@
30 30
  * ip_icmp.h,v 1.4 1995/05/30 08:09:43 rgrimes Exp
31 31
  */
32 32
 
33
-#ifndef _NETINET_IP_ICMP_H_
34
-#define _NETINET_IP_ICMP_H_
33
+#ifndef NETINET_IP_ICMP_H
34
+#define NETINET_IP_ICMP_H
35 35
 
36 36
 /*
37 37
  * Interface Control Message Protocol Definitions.

+ 2
- 2
slirp/libslirp.h View File

@@ -1,5 +1,5 @@
1
-#ifndef _LIBSLIRP_H
2
-#define _LIBSLIRP_H
1
+#ifndef LIBSLIRP_H
2
+#define LIBSLIRP_H
3 3
 
4 4
 #include "qemu-common.h"
5 5
 

+ 2
- 2
slirp/mbuf.h View File

@@ -30,8 +30,8 @@
30 30
  * mbuf.h,v 1.9 1994/11/14 13:54:20 bde Exp
31 31
  */
32 32
 
33
-#ifndef _MBUF_H_
34
-#define _MBUF_H_
33
+#ifndef MBUF_H
34
+#define MBUF_H
35 35
 
36 36
 #define MINCSIZE 4096	/* Amount to increase mbuf if too small */
37 37
 

+ 2
- 2
slirp/misc.h View File

@@ -5,8 +5,8 @@
5 5
  * terms and conditions of the copyright.
6 6
  */
7 7
 
8
-#ifndef _MISC_H_
9
-#define _MISC_H_
8
+#ifndef MISC_H
9
+#define MISC_H
10 10
 
11 11
 struct ex_list {
12 12
 	int ex_pty;			/* Do we want a pty? */

+ 2
- 2
slirp/sbuf.h View File

@@ -5,8 +5,8 @@
5 5
  * terms and conditions of the copyright.
6 6
  */
7 7
 
8
-#ifndef _SBUF_H_
9
-#define _SBUF_H_
8
+#ifndef SBUF_H
9
+#define SBUF_H
10 10
 
11 11
 #define sbflush(sb) sbdrop((sb),(sb)->sb_cc)
12 12
 #define sbspace(sb) ((sb)->sb_datalen - (sb)->sb_cc)

+ 3
- 3
slirp/socket.h View File

@@ -5,8 +5,8 @@
5 5
  * terms and conditions of the copyright.
6 6
  */
7 7
 
8
-#ifndef _SLIRP_SOCKET_H_
9
-#define _SLIRP_SOCKET_H_
8
+#ifndef SLIRP_SOCKET_H
9
+#define SLIRP_SOCKET_H
10 10
 
11 11
 #define SO_EXPIRE 240000
12 12
 #define SO_EXPIREFAST 10000
@@ -158,4 +158,4 @@ void sotranslate_in(struct socket *, struct sockaddr_storage *);
158 158
 void sotranslate_accept(struct socket *);
159 159
 
160 160
 
161
-#endif /* _SOCKET_H_ */
161
+#endif /* SLIRP_SOCKET_H */

+ 2
- 2
slirp/tcp.h View File

@@ -30,8 +30,8 @@
30 30
  * tcp.h,v 1.3 1994/08/21 05:27:34 paul Exp
31 31
  */
32 32
 
33
-#ifndef _TCP_H_
34
-#define _TCP_H_
33
+#ifndef TCP_H
34
+#define TCP_H
35 35
 
36 36
 typedef	uint32_t tcp_seq;
37 37
 

+ 2
- 2
slirp/tcp_timer.h View File

@@ -30,8 +30,8 @@
30 30
  * tcp_timer.h,v 1.4 1994/08/21 05:27:38 paul Exp
31 31
  */
32 32
 
33
-#ifndef _TCP_TIMER_H_
34
-#define _TCP_TIMER_H_
33
+#ifndef TCP_TIMER_H
34
+#define TCP_TIMER_H
35 35
 
36 36
 /*
37 37
  * Definitions of the TCP timers.  These timers are counted

+ 2
- 2
slirp/tcp_var.h View File

@@ -30,8 +30,8 @@
30 30
  * tcp_var.h,v 1.3 1994/08/21 05:27:39 paul Exp
31 31
  */
32 32
 
33
-#ifndef _TCP_VAR_H_
34
-#define _TCP_VAR_H_
33
+#ifndef TCP_VAR_H
34
+#define TCP_VAR_H
35 35
 
36 36
 #include "tcpip.h"
37 37
 #include "tcp_timer.h"

+ 2
- 2
slirp/tcpip.h View File

@@ -30,8 +30,8 @@
30 30
  * tcpip.h,v 1.3 1994/08/21 05:27:40 paul Exp
31 31
  */
32 32
 
33
-#ifndef _TCPIP_H_
34
-#define _TCPIP_H_
33
+#ifndef TCPIP_H
34
+#define TCPIP_H
35 35
 
36 36
 /*
37 37
  * Tcp+ip header, after ip options removed.

+ 2
- 2
slirp/udp.h View File

@@ -30,8 +30,8 @@
30 30
  * udp.h,v 1.3 1994/08/21 05:27:41 paul Exp
31 31
  */
32 32
 
33
-#ifndef _UDP_H_
34
-#define _UDP_H_
33
+#ifndef UDP_H
34
+#define UDP_H
35 35
 
36 36
 #define UDP_TTL 0x60
37 37
 #define UDP_UDPDATALEN 16192

+ 2
- 2
target-i386/svm.h View File

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

+ 3
- 3
target-mips/kvm_mips.h View File

@@ -9,8 +9,8 @@
9 9
  * Authors: Sanjay Lal <sanjayl@kymasys.com>
10 10
 */
11 11
 
12
-#ifndef __KVM_MIPS_H__
13
-#define __KVM_MIPS_H__
12
+#ifndef KVM_MIPS_H
13
+#define KVM_MIPS_H
14 14
 
15 15
 /**
16 16
  * kvm_mips_reset_vcpu:
@@ -23,4 +23,4 @@ void kvm_mips_reset_vcpu(MIPSCPU *cpu);
23 23
 int kvm_mips_set_interrupt(MIPSCPU *cpu, int irq, int level);
24 24
 int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level);
25 25
 
26
-#endif /* __KVM_MIPS_H__ */
26
+#endif /* KVM_MIPS_H */

+ 3
- 3
target-mips/mips-defs.h View File

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

+ 3
- 3
target-ppc/helper_regs.h View File

@@ -17,8 +17,8 @@
17 17
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
18 18
  */
19 19
 
20
-#if !defined(__HELPER_REGS_H__)
21
-#define __HELPER_REGS_H__
20
+#ifndef HELPER_REGS_H
21
+#define HELPER_REGS_H
22 22
 
23 23
 /* Swap temporary saved registers with GPRs */
24 24
 static inline void hreg_swap_gpr_tgpr(CPUPPCState *env)
@@ -168,4 +168,4 @@ static inline void check_tlb_flush(CPUPPCState *env)
168 168
 static inline void check_tlb_flush(CPUPPCState *env) { }
169 169
 #endif
170 170
 
171
-#endif /* !defined(__HELPER_REGS_H__) */
171
+#endif /* HELPER_REGS_H */

+ 3
- 3
target-ppc/kvm_ppc.h View File

@@ -6,8 +6,8 @@
6 6
  *
7 7
  */
8 8
 
9
-#ifndef __KVM_PPC_H__
10
-#define __KVM_PPC_H__
9
+#ifndef KVM_PPC_H
10
+#define KVM_PPC_H
11 11
 
12 12
 #define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU
13 13
 
@@ -316,4 +316,4 @@ static inline void kvmppc_icbi_range(PowerPCCPU *cpu, uint8_t *addr, int len)
316 316
 #define KVM_INTERRUPT_SET_LEVEL -3
317 317
 #endif
318 318
 
319
-#endif /* __KVM_PPC_H__ */
319
+#endif /* KVM_PPC_H */

+ 3
- 3
target-ppc/mmu-hash32.h View File

@@ -1,5 +1,5 @@
1
-#if !defined (__MMU_HASH32_H__)
2
-#define __MMU_HASH32_H__
1
+#ifndef MMU_HASH32_H
2
+#define MMU_HASH32_H
3 3
 
4 4
 #ifndef CONFIG_USER_ONLY
5 5
 
@@ -109,4 +109,4 @@ typedef struct {
109 109
 
110 110
 #endif /* CONFIG_USER_ONLY */
111 111
 
112
-#endif /* __MMU_HASH32_H__ */
112
+#endif /* MMU_HASH32_H */

+ 3
- 3
target-ppc/mmu-hash64.h View File

@@ -1,5 +1,5 @@
1
-#if !defined (__MMU_HASH64_H__)
2
-#define __MMU_HASH64_H__
1
+#ifndef MMU_HASH64_H
2
+#define MMU_HASH64_H
3 3
 
4 4
 #ifndef CONFIG_USER_ONLY
5 5
 
@@ -134,4 +134,4 @@ typedef struct {
134 134
 
135 135
 #endif /* CONFIG_USER_ONLY */
136 136
 
137
-#endif /* !defined (__MMU_HASH64_H__) */
137
+#endif /* MMU_HASH64_H */

+ 3
- 3
target-tricore/tricore-defs.h View File

@@ -15,8 +15,8 @@
15 15
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
16 16
  */
17 17
 
18
-#if !defined(__QEMU_TRICORE_DEFS_H__)
19
-#define __QEMU_TRICORE_DEFS_H__
18
+#ifndef QEMU_TRICORE_DEFS_H
19
+#define QEMU_TRICORE_DEFS_H
20 20
 
21 21
 #define TARGET_PAGE_BITS 14
22 22
 #define TARGET_LONG_BITS 32
@@ -25,4 +25,4 @@
25 25
 
26 26
 #define TRICORE_TLB_MAX 128
27 27
 
28
-#endif /* __QEMU_TRICORE_DEFS_H__ */
28
+#endif /* QEMU_TRICORE_DEFS_H */

+ 3
- 3
tests/boot-sector.h View File

@@ -11,8 +11,8 @@
11 11
  * See the COPYING file in the top-level directory.
12 12
  */
13 13
 
14
-#ifndef TEST_BOOT_SECTOR
15
-#define TEST_BOOT_SECTOR
14
+#ifndef TEST_BOOT_SECTOR_H
15
+#define TEST_BOOT_SECTOR_H
16 16
 
17 17
 /* Create boot disk file.  */
18 18
 int boot_sector_init(const char *fname);
@@ -23,4 +23,4 @@ void boot_sector_test(void);
23 23
 /* unlink boot disk file.  */
24 24
 void boot_sector_cleanup(const char *fname);
25 25
 
26
-#endif /* TEST_BOOT_SECTOR */
26
+#endif /* TEST_BOOT_SECTOR_H */

+ 2
- 2
tests/libqos/ahci.h View File

@@ -1,5 +1,5 @@
1
-#ifndef __libqos_ahci_h
2
-#define __libqos_ahci_h
1
+#ifndef LIBQOS_AHCI_H
2
+#define LIBQOS_AHCI_H
3 3
 
4 4
 /*
5 5
  * AHCI qtest library functions and definitions

+ 2
- 2
tests/libqos/libqos-pc.h View File

@@ -1,5 +1,5 @@
1
-#ifndef __libqos_pc_h
2
-#define __libqos_pc_h
1
+#ifndef LIBQOS_PC_H
2
+#define LIBQOS_PC_H
3 3
 
4 4
 #include "libqos/libqos.h"
5 5
 

+ 2
- 2
tests/libqos/libqos.h View File

@@ -1,5 +1,5 @@
1
-#ifndef __libqos_h
2
-#define __libqos_h
1
+#ifndef LIBQOS_H
2
+#define LIBQOS_H
3 3
 
4 4
 #include "libqtest.h"
5 5
 #include "libqos/pci.h"

+ 3
- 3
ui/keymaps.h View File

@@ -22,8 +22,8 @@
22 22
  * THE SOFTWARE.
23 23
  */
24 24
 
25
-#ifndef __QEMU_KEYMAPS_H__
26
-#define __QEMU_KEYMAPS_H__
25
+#ifndef QEMU_KEYMAPS_H
26
+#define QEMU_KEYMAPS_H
27 27
 
28 28
 #include "qemu-common.h"
29 29
 
@@ -74,4 +74,4 @@ int keysym2scancode(void *kbd_layout, int keysym);
74 74
 int keycode_is_keypad(void *kbd_layout, int keycode);
75 75
 int keysym_is_numlock(void *kbd_layout, int keysym);
76 76
 
77
-#endif /* __QEMU_KEYMAPS_H__ */
77
+#endif /* QEMU_KEYMAPS_H */

+ 3
- 3
ui/sdl_zoom.h View File

@@ -11,8 +11,8 @@
11 11
  *
12 12
  */
13 13
 
14
-#ifndef SDL_zoom_h
15
-#define SDL_zoom_h
14
+#ifndef SDL_ZOOM_H
15
+#define SDL_ZOOM_H
16 16
 
17 17
 #include <SDL.h>
18 18
 
@@ -22,4 +22,4 @@
22 22
 int sdl_zoom_blit(SDL_Surface *src_sfc, SDL_Surface *dst_sfc,
23 23
                   int smooth, SDL_Rect *src_rect);
24 24
 
25
-#endif /* SDL_zoom_h */
25
+#endif /* SDL_ZOOM_H */

+ 3
- 6
ui/vnc-auth-sasl.h View File

@@ -22,10 +22,8 @@
22 22
  * THE SOFTWARE.
23 23
  */
24 24
 
25
-
26
-#ifndef __QEMU_VNC_AUTH_SASL_H__
27
-#define __QEMU_VNC_AUTH_SASL_H__
28
-
25
+#ifndef QEMU_VNC_AUTH_SASL_H
26
+#define QEMU_VNC_AUTH_SASL_H
29 27
 
30 28
 #include <sasl/sasl.h>
31 29
 
@@ -71,5 +69,4 @@ long vnc_client_write_sasl(VncState *vs);
71 69
 
72 70
 void start_auth_sasl(VncState *vs);
73 71
 
74
-#endif /* __QEMU_VNC_AUTH_SASL_H__ */
75
-
72
+#endif /* QEMU_VNC_AUTH_SASL_H */

+ 3
- 4
ui/vnc-auth-vencrypt.h View File

@@ -24,10 +24,9 @@
24 24
  * THE SOFTWARE.
25 25
  */
26 26
 
27
-
28
-#ifndef __QEMU_VNC_AUTH_VENCRYPT_H__
29
-#define __QEMU_VNC_AUTH_VENCRYPT_H__
27
+#ifndef QEMU_VNC_AUTH_VENCRYPT_H
28
+#define QEMU_VNC_AUTH_VENCRYPT_H
30 29
 
31 30
 void start_auth_vencrypt(VncState *vs);
32 31
 
33
-#endif /* __QEMU_VNC_AUTH_VENCRYPT_H__ */
32
+#endif /* QEMU_VNC_AUTH_VENCRYPT_H */

+ 3
- 3
ui/vnc-ws.h View File

@@ -18,8 +18,8 @@
18 18
  * along with this software; if not, see <http://www.gnu.org/licenses/>.
19 19
  */
20 20
 
21
-#ifndef __QEMU_UI_VNC_WS_H
22
-#define __QEMU_UI_VNC_WS_H
21
+#ifndef QEMU_UI_VNC_WS_H
22
+#define QEMU_UI_VNC_WS_H
23 23
 
24 24
 gboolean vncws_tls_handshake_io(QIOChannel *ioc,
25 25
                                 GIOCondition condition,
@@ -28,4 +28,4 @@ gboolean vncws_handshake_io(QIOChannel *ioc,
28 28
                             GIOCondition condition,
29 29
                             void *opaque);
30 30
 
31
-#endif /* __QEMU_UI_VNC_WS_H */
31
+#endif /* QEMU_UI_VNC_WS_H */

+ 3
- 3
ui/vnc.h View File

@@ -24,8 +24,8 @@
24 24
  * THE SOFTWARE.
25 25
  */
26 26
 
27
-#ifndef __QEMU_VNC_H
28
-#define __QEMU_VNC_H
27
+#ifndef QEMU_VNC_H
28
+#define QEMU_VNC_H
29 29
 
30 30
 #include "qemu-common.h"
31 31
 #include "qemu/queue.h"
@@ -577,4 +577,4 @@ int vnc_zrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
577 577
 int vnc_zywrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
578 578
 void vnc_zrle_clear(VncState *vs);
579 579
 
580
-#endif /* __QEMU_VNC_H */
580
+#endif /* QEMU_VNC_H */

Loading…
Cancel
Save