Switch to #pragma once for headers

It's just less tedious, and we're GCC/LLVM specific anyways.
2013-07-09 18:53:22 -04:00
1 parent 7f48c77204
commit 5ad0671cd2
@@ -19,8 +19,7 @@
 *
 */

-#ifndef __OSTREE_CHAIN_INPUT_STREAM_H__
-#define __OSTREE_CHAIN_INPUT_STREAM_H__
+#pragma once

 #include <gio/gio.h>

@@ -64,4 +63,3 @@ OstreeChainInputStream * ostree_chain_input_stream_new          (GPtrArray *stre

 G_END_DECLS

-#endif /* __OSTREE_CHAIN_INPUT_STREAM_H__ */
@@ -19,8 +19,7 @@
 *
 */

-#ifndef __OSTREE_CHECKSUM_INPUT_STREAM_H__
-#define __OSTREE_CHECKSUM_INPUT_STREAM_H__
+#pragma once

 #include <gio/gio.h>

@@ -65,4 +64,3 @@ OstreeChecksumInputStream * ostree_checksum_input_stream_new          (GInputStr

 G_END_DECLS

-#endif /* __OSTREE_CHECKSUM_INPUT_STREAM_H__ */
@@ -20,8 +20,7 @@
 * Author: Colin Walters <walters@verbum.org>
 */

-#ifndef _OSTREE_CORE
-#define _OSTREE_CORE
+#pragma once

 #include <otutil.h>

@@ -308,4 +307,5 @@ gboolean ostree_validate_structureof_dirtree (GVariant      *index,
 gboolean ostree_validate_structureof_dirmeta (GVariant      *index,
                                              GError       **error);

-#endif /* _OSTREE_REPO */
+
+G_END_DECLS
@@ -20,8 +20,7 @@
 * Author: Colin Walters <walters@verbum.org>
 */

-#ifndef _OSTREE_DIFF
-#define _OSTREE_DIFF
+#pragma once

 #include "ostree-core.h"
 #include "ostree-types.h"
@@ -62,4 +61,3 @@ void ostree_diff_print (GFile          *a,

 G_END_DECLS

-#endif /* _OSTREE_REPO */
@@ -20,8 +20,7 @@
 * Author: Alexander Larsson <alexl@redhat.com>
 */

-#ifndef __OSTREE_LIBARCHIVE_INPUT_STREAM_H__
-#define __OSTREE_LIBARCHIVE_INPUT_STREAM_H__
+#pragma once

 #include <gio/gio.h>

@@ -65,4 +64,3 @@ GInputStream * ostree_libarchive_input_stream_new          (struct archive  *a);

 G_END_DECLS

-#endif /* __OSTREE_LIBARCHIVE_INPUT_STREAM_H__ */
@@ -20,8 +20,7 @@
 * Author: Colin Walters <walters@verbum.org>
 */

-#ifndef _OSTREE_MUTABLE_TREE
-#define _OSTREE_MUTABLE_TREE
+#pragma once

 #include "ostree-types.h"

@@ -94,4 +93,3 @@ GHashTable * ostree_mutable_tree_get_files (OstreeMutableTree *self);

 G_END_DECLS

-#endif
@@ -20,8 +20,7 @@
 * Author: Colin Walters <walters@verbum.org>
 */

-#ifndef _OSTREE_REPO_FILE_ENUMERATOR
-#define _OSTREE_REPO_FILE_ENUMERATOR
+#pragma once

 #include "ostree-repo-file.h"

@@ -54,4 +53,3 @@ GFileEnumerator * _ostree_repo_file_enumerator_new      (OstreeRepoFile       *d

 G_END_DECLS

-#endif
@@ -20,8 +20,7 @@
 * Author: Colin Walters <walters@verbum.org>
 */

-#ifndef _OSTREE_REPO_FILE
-#define _OSTREE_REPO_FILE
+#pragma once

 #include "ostree-types.h"

@@ -96,4 +95,3 @@ GVariant *ostree_repo_file_tree_get_metadata (OstreeRepoFile  *self);

 G_END_DECLS

-#endif
@@ -20,8 +20,7 @@
 * Author: Colin Walters <walters@verbum.org>
 */

-#ifndef _OSTREE_REPO
-#define _OSTREE_REPO
+#pragma once

 #include "ostree-core.h"
 #include "ostree-types.h"
@@ -320,4 +319,3 @@ gboolean ostree_repo_list_objects (OstreeRepo                  *self,

 G_END_DECLS

-#endif /* _OSTREE_REPO */
@@ -20,8 +20,7 @@
 * Author: Colin Walters <walters@verbum.org>
 */

-#ifndef _OSTREE_TRAVERSE
-#define _OSTREE_TRAVERSE
+#pragma once

 #include "ostree-core.h"
 #include "ostree-types.h"
@@ -45,4 +44,3 @@ gboolean ostree_traverse_commit (OstreeRepo         *repo,

 G_END_DECLS

-#endif /* _OSTREE_REPO */
@@ -20,8 +20,7 @@
 * Author: Colin Walters <walters@verbum.org>
 */

-#ifndef _OSTREE_TYPES
-#define _OSTREE_TYPES
+#pragma once

 #include <gio/gio.h>

@@ -36,4 +35,3 @@ typedef struct OstreeRepoFile OstreeRepoFile;

 G_END_DECLS

-#endif
@@ -20,7 +20,7 @@
 * Author: Colin Walters <walters@verbum.org>
 */

-#ifndef __OSTREE_H__
+#pragma once

 #include <ostree-checksum-input-stream.h>
 #include <ostree-chain-input-stream.h>
@@ -30,5 +30,3 @@
 #include <ostree-repo-file.h>
 #include <ostree-traverse.h>
 #include <ostree-diff.h>
-
-#endif