diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-06-04 20:16:15 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-06-12 13:20:20 +0200 |
| commit | 0553d895f98d6ffa7354dee324ff7a65fca3367f (patch) | |
| tree | 1bd0b187a8e4aa421d7af3e01ca3d18c80a5c2eb /crypto | |
| parent | a8d2532645cf5ce4f75981f81dfe363efc35d05c (diff) | |
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: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190604181618.19980-2-armbru@redhat.com>
[Rebased with conflicts resolved automatically]
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ivgen-essiv.h | 9 | ||||
| -rw-r--r-- | crypto/ivgen-plain.h | 5 | ||||
| -rw-r--r-- | crypto/ivgen-plain64.h | 9 |
3 files changed, 10 insertions, 13 deletions
diff --git a/crypto/ivgen-essiv.h b/crypto/ivgen-essiv.h index f34dbab57b..6c35c0b5ab 100644 --- a/crypto/ivgen-essiv.h +++ b/crypto/ivgen-essiv.h @@ -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 */ diff --git a/crypto/ivgen-plain.h b/crypto/ivgen-plain.h index 16e1ae5b27..395501f693 100644 --- a/crypto/ivgen-plain.h +++ b/crypto/ivgen-plain.h @@ -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__ */ diff --git a/crypto/ivgen-plain64.h b/crypto/ivgen-plain64.h index f8611bd705..0a20fd1fd8 100644 --- a/crypto/ivgen-plain64.h +++ b/crypto/ivgen-plain64.h @@ -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 */ |