Commit 0553d895 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

Normalize position of header guard 



This is the common header guard idiom:

    /*
     * File comment
     */

    #ifndef GUARD_SYMBOL_H
    #define GUARD_SYMBOL_H

    ... actual contents ...

    #endif

A few of our headers have some #include before the guard.
target/tilegx/spr_def_64.h has #ifndef __DOXYGEN__ outside the guard.
A few more have the #define elsewhere.

Change them to match the common idiom.  For spr_def_64.h, that means
dropping #ifndef __DOXYGEN__.  While there, rename guard symbols to
make scripts/clean-header-guards.pl happy.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190604181618.19980-2-armbru@redhat.com>
[Rebased with conflicts resolved automatically]
parent a8d25326

crypto/ivgen-essiv.h

+4 −5
Original line number Diff line number Diff line
@@ -15,14 +15,13 @@ 
 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 *

 */



#include "ivgenpriv.h"

#ifndef QCRYPTO_IVGEN_ESSIV_H

#define QCRYPTO_IVGEN_ESSIV_H



#ifndef QCRYPTO_IVGEN_ESSIV_H__

#define QCRYPTO_IVGEN_ESSIV_H__

#include "ivgenpriv.h"



extern struct QCryptoIVGenDriver qcrypto_ivgen_essiv;



#endif /* QCRYPTO_IVGEN_ESSIV_H__ */
 
#endif /* QCRYPTO_IVGEN_ESSIV_H */

crypto/ivgen-plain.h

+2 −3
Original line number Diff line number Diff line
@@ -15,14 +15,13 @@ 
 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 *

 */



#include "ivgenpriv.h"



#ifndef QCRYPTO_IVGEN_PLAIN_H__

#define QCRYPTO_IVGEN_PLAIN_H__



#include "ivgenpriv.h"



extern struct QCryptoIVGenDriver qcrypto_ivgen_plain;



#endif /* QCRYPTO_IVGEN_PLAIN_H__ */

crypto/ivgen-plain64.h

+4 −5
Original line number Diff line number Diff line
@@ -15,14 +15,13 @@ 
 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 *

 */



#include "ivgenpriv.h"

#ifndef QCRYPTO_IVGEN_PLAIN64_H

#define QCRYPTO_IVGEN_PLAIN64_H



#ifndef QCRYPTO_IVGEN_PLAIN64_H__

#define QCRYPTO_IVGEN_PLAIN64_H__

#include "ivgenpriv.h"



extern struct QCryptoIVGenDriver qcrypto_ivgen_plain64;



#endif /* QCRYPTO_IVGEN_PLAIN64_H__ */
 
#endif /* QCRYPTO_IVGEN_PLAIN64_H */

include/hw/arm/allwinner-a10.h

+2 −2
Original line number Diff line number Diff line 
#ifndef ALLWINNER_H_

#ifndef HW_ARM_ALLWINNER_A10_H

#define HW_ARM_ALLWINNER_A10_H



#include "qemu/error-report.h"

#include "hw/char/serial.h"
@@ -37,5 +38,4 @@ typedef struct AwA10State { 
    MemoryRegion sram_a;

} AwA10State;



#define ALLWINNER_H_

#endif

include/hw/arm/omap.h

+5 −3
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ 
 * You should have received a copy of the GNU General Public License along

 * with this program; if not, see <http://www.gnu.org/licenses/>.

 */

#ifndef hw_omap_h



#ifndef HW_ARM_OMAP_H

#define HW_ARM_OMAP_H



#include "exec/memory.h"

# define hw_omap_h		"omap.h"

#include "hw/irq.h"

#include "hw/input/tsc2xxx.h"

#include "target/arm/cpu-qom.h"
@@ -991,4 +993,4 @@ enum { 


# define OMAP_MPUI_REG_MASK		0x000007ff



#endif /* hw_omap_h */
 
#endif