Clean up header guards that don't match their file name

Header guard symbols should match their file name to make guard
collisions less likely.  Offenders found with
scripts/clean-header-guards.pl -vn.

Cleaned up with scripts/clean-header-guards.pl, followed by some
renaming of new guard symbols picked by the script to better ones.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Markus Armbruster 2016-06-29 10:12:57 +02:00
parent 85aad98a0e
commit 121d07125b
83 changed files with 223 additions and 215 deletions

View file

@ -11,8 +11,8 @@
*
*/
#ifndef QMP_CORE_H
#define QMP_CORE_H
#ifndef QAPI_QMP_DISPATCH_H
#define QAPI_QMP_DISPATCH_H
#include "qapi/qmp/qobject.h"
#include "qapi/qmp/qdict.h"
@ -48,4 +48,3 @@ typedef void (*qmp_cmd_callback_fn)(QmpCommand *cmd, void *opaque);
void qmp_for_each_command(qmp_cmd_callback_fn fn, void *opaque);
#endif

View file

@ -10,8 +10,8 @@
* See the COPYING.LIB file in the top-level directory.
*/
#ifndef QEMU_OBJECTS_H
#define QEMU_OBJECTS_H
#ifndef QAPI_QMP_TYPES_H
#define QAPI_QMP_TYPES_H
#include "qapi/qmp/qobject.h"
#include "qapi/qmp/qint.h"
@ -21,4 +21,4 @@
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
#endif /* QEMU_OBJECTS_H */
#endif /* QAPI_QMP_TYPES_H */

View file

@ -11,8 +11,9 @@
* See the COPYING.LIB file in the top-level directory.
*
*/
#ifndef QAPI_VISITOR_CORE_H
#define QAPI_VISITOR_CORE_H
#ifndef QAPI_VISITOR_H
#define QAPI_VISITOR_H
#include "qapi/qmp/qobject.h"