diff options
| author | Markus Armbruster <armbru@redhat.com> | 2016-06-29 13:47:03 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-07-12 16:20:46 +0200 |
| commit | 2a6a4076e117113ebec97b1821071afccfdfbc96 (patch) | |
| tree | 349b8c30ac34fa345b5ce59aa1f4271dfe1a6543 /ui | |
| parent | 965379b4555aef0aaae734a7be139454bb0fcac4 (diff) | |
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>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/keymaps.h | 6 | ||||
| -rw-r--r-- | ui/sdl_zoom.h | 6 | ||||
| -rw-r--r-- | ui/vnc-auth-sasl.h | 9 | ||||
| -rw-r--r-- | ui/vnc-auth-vencrypt.h | 7 | ||||
| -rw-r--r-- | ui/vnc-ws.h | 6 | ||||
| -rw-r--r-- | ui/vnc.h | 6 |
6 files changed, 18 insertions, 22 deletions
diff --git a/ui/keymaps.h b/ui/keymaps.h index a7600d5751..47d061343e 100644 --- a/ui/keymaps.h +++ b/ui/keymaps.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef __QEMU_KEYMAPS_H__ -#define __QEMU_KEYMAPS_H__ +#ifndef QEMU_KEYMAPS_H +#define QEMU_KEYMAPS_H #include "qemu-common.h" @@ -74,4 +74,4 @@ int keysym2scancode(void *kbd_layout, int keysym); int keycode_is_keypad(void *kbd_layout, int keycode); int keysym_is_numlock(void *kbd_layout, int keysym); -#endif /* __QEMU_KEYMAPS_H__ */ +#endif /* QEMU_KEYMAPS_H */ diff --git a/ui/sdl_zoom.h b/ui/sdl_zoom.h index 74955bc944..39696ddb08 100644 --- a/ui/sdl_zoom.h +++ b/ui/sdl_zoom.h @@ -11,8 +11,8 @@ * */ -#ifndef SDL_zoom_h -#define SDL_zoom_h +#ifndef SDL_ZOOM_H +#define SDL_ZOOM_H #include <SDL.h> @@ -22,4 +22,4 @@ int sdl_zoom_blit(SDL_Surface *src_sfc, SDL_Surface *dst_sfc, int smooth, SDL_Rect *src_rect); -#endif /* SDL_zoom_h */ +#endif /* SDL_ZOOM_H */ diff --git a/ui/vnc-auth-sasl.h b/ui/vnc-auth-sasl.h index 3f59da67eb..cb42745a6b 100644 --- a/ui/vnc-auth-sasl.h +++ b/ui/vnc-auth-sasl.h @@ -22,10 +22,8 @@ * THE SOFTWARE. */ - -#ifndef __QEMU_VNC_AUTH_SASL_H__ -#define __QEMU_VNC_AUTH_SASL_H__ - +#ifndef QEMU_VNC_AUTH_SASL_H +#define QEMU_VNC_AUTH_SASL_H #include <sasl/sasl.h> @@ -71,5 +69,4 @@ long vnc_client_write_sasl(VncState *vs); void start_auth_sasl(VncState *vs); -#endif /* __QEMU_VNC_AUTH_SASL_H__ */ - +#endif /* QEMU_VNC_AUTH_SASL_H */ diff --git a/ui/vnc-auth-vencrypt.h b/ui/vnc-auth-vencrypt.h index 9f674c5173..1e35406664 100644 --- a/ui/vnc-auth-vencrypt.h +++ b/ui/vnc-auth-vencrypt.h @@ -24,10 +24,9 @@ * THE SOFTWARE. */ - -#ifndef __QEMU_VNC_AUTH_VENCRYPT_H__ -#define __QEMU_VNC_AUTH_VENCRYPT_H__ +#ifndef QEMU_VNC_AUTH_VENCRYPT_H +#define QEMU_VNC_AUTH_VENCRYPT_H void start_auth_vencrypt(VncState *vs); -#endif /* __QEMU_VNC_AUTH_VENCRYPT_H__ */ +#endif /* QEMU_VNC_AUTH_VENCRYPT_H */ diff --git a/ui/vnc-ws.h b/ui/vnc-ws.h index 652b6fc390..396cacfcb0 100644 --- a/ui/vnc-ws.h +++ b/ui/vnc-ws.h @@ -18,8 +18,8 @@ * along with this software; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_UI_VNC_WS_H -#define __QEMU_UI_VNC_WS_H +#ifndef QEMU_UI_VNC_WS_H +#define QEMU_UI_VNC_WS_H gboolean vncws_tls_handshake_io(QIOChannel *ioc, GIOCondition condition, @@ -28,4 +28,4 @@ gboolean vncws_handshake_io(QIOChannel *ioc, GIOCondition condition, void *opaque); -#endif /* __QEMU_UI_VNC_WS_H */ +#endif /* QEMU_UI_VNC_WS_H */ @@ -24,8 +24,8 @@ * THE SOFTWARE. */ -#ifndef __QEMU_VNC_H -#define __QEMU_VNC_H +#ifndef QEMU_VNC_H +#define QEMU_VNC_H #include "qemu-common.h" #include "qemu/queue.h" @@ -577,4 +577,4 @@ int vnc_zrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h); int vnc_zywrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h); void vnc_zrle_clear(VncState *vs); -#endif /* __QEMU_VNC_H */ +#endif /* QEMU_VNC_H */ |