loader: Use #pragma once everywhere

The #pragma once include guard is sufficiently widespread enough to allow
usage of it everywhere.

diff --git a/loader/cJSON.h b/loader/cJSON.h
index d8bbecd3c27614869b1b8b9e81f5abea241e55d5..e6b5ac4721b6f6e6ef50accd143c848c87005371 100644 (file)
--- a/loader/cJSON.h
+++ b/loader/cJSON.h
@@ -23,8 +23,7 @@
   THE SOFTWARE.
 */
 
-#ifndef cJSON__h
-#define cJSON__h
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -169,5 +168,3 @@ extern void cJSON_Minify(char *json);
 #ifdef __cplusplus
 }
 #endif
-
-#endif

diff --git a/loader/debug_utils.h b/loader/debug_utils.h
index c33a6fcee60b3d0d7c36237bb7d539ac5cff7a96..ab50d536129b98339c996c0e7eecc56a8fd294e3 100644 (file)
--- a/loader/debug_utils.h
+++ b/loader/debug_utils.h
@@ -22,6 +22,8 @@
  *
  */
 
+#pragma once
+
 #include "vk_loader_platform.h"
 #include "loader.h"
 

diff --git a/loader/dirent_on_windows.h b/loader/dirent_on_windows.h
index 8600f8ef04026323368d3febf26b8ab911741e69..c3d43bc4183991455110d4f1e1334067e6a4e780 100644 (file)
--- a/loader/dirent_on_windows.h
+++ b/loader/dirent_on_windows.h
@@ -1,5 +1,4 @@
-#ifndef DIRENT_INCLUDED
-#define DIRENT_INCLUDED
+#pragma once
 
 /*
 
@@ -47,5 +46,3 @@ void rewinddir(DIR *);
 #ifdef __cplusplus
 }
 #endif
-
-#endif

diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h
index 01dec6fa727fed42884100d4fd227ba957b9f4b3..8abe9e973c1d77f17c5ecebf588df121eb698a69 100644 (file)
--- a/loader/gpa_helper.h
+++ b/loader/gpa_helper.h
@@ -19,6 +19,8 @@
  * Author: Jon Ashburn <jon@lunarg.com>
  */
 
+#pragma once
+
 #include <string.h>
 #include "debug_utils.h"
 #include "wsi.h"

diff --git a/loader/loader.h b/loader/loader.h
index 955e6d232e4fb0b938d1168e2037db0c9bff473e..c9ee3963fc31867fa8a42e8b67085db94517d65c 100644 (file)
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -27,8 +27,7 @@
  *
  */
 
-#ifndef LOADER_H
-#define LOADER_H
+#pragma once
 
 #include <vulkan/vulkan.h>
 #include "vk_loader_platform.h"
@@ -559,5 +558,3 @@ VkResult setup_loader_tramp_phys_devs(VkInstance instance);
 VkResult setup_loader_term_phys_devs(struct loader_instance *inst);
 
 VkStringErrorFlags vk_string_validate(const int max_length, const char *char_array);
-
-#endif  // LOADER_H

diff --git a/loader/murmurhash.h b/loader/murmurhash.h
index 775532e8b8d0c726b97b2f5bcaeb24a680539e51..7b5b1510e5e30167a34f4a501c1621eafe4b7186 100644 (file)
--- a/loader/murmurhash.h
+++ b/loader/murmurhash.h
@@ -27,8 +27,7 @@
  * USE OR OTHER DEALINGS IN THE MATERIALS.
  */
 
-#ifndef MURMURHASH_H
-#define MURMURHASH_H 1
+#pragma once
 
 #include <stdint.h>
 
@@ -48,5 +47,3 @@ uint32_t murmurhash(const char *key, size_t len, uint32_t seed);
 #ifdef __cplusplus
 }
 #endif
-
-#endif

diff --git a/loader/wsi.h b/loader/wsi.h
index c2f414c6dbe55745fdf81bb768d795fc30abe8d7..9404c44dfbd131e16670ef68a677e3872373ea50 100644 (file)
--- a/loader/wsi.h
+++ b/loader/wsi.h
@@ -19,8 +19,7 @@
  *
  */
 
-#ifndef WSI_H
-#define WSI_H
+#pragma once
 
 #include "vk_loader_platform.h"
 #include "loader.h"
@@ -231,5 +230,3 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceFormats2KHR(Vk
                                                                               const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo,
                                                                               uint32_t *pSurfaceFormatCount,
                                                                               VkSurfaceFormat2KHR *pSurfaceFormats);
-
-#endif  // WSI_H