Skip to content

Commit

Permalink
angle_version.h and angle_version_info.h should not use the same head…
Browse files Browse the repository at this point in the history
…er guard macro

https://bugs.webkit.org/show_bug.cgi?id=245018
<rdar://99770768>

Reviewed by Kimmo Kinnunen.

* Source/ThirdParty/ANGLE/changes.diff: Update.
* Source/ThirdParty/ANGLE/src/common/angle_version_info.h:
- Change header guard to COMMON_VERSION_INFO_H_ so that it
  differs from COMMON_VERSION_H_ in angle_version.h.

Canonical link: https://commits.webkit.org/254370@main
  • Loading branch information
David Kilzer authored and kkinnunen-apple committed Sep 12, 2022
1 parent 6cb8935 commit 1a61b3d
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 3 deletions.
21 changes: 21 additions & 0 deletions Source/ThirdParty/ANGLE/changes.diff
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
diff --git a/src/common/angle_version_info.h b/src/common/angle_version_info.h
index 27de24182bdb30b736c17ac025df19d2aea56712..1d5392068c277d4999a0710eb56ab87ff6857129 100644
--- a/src/common/angle_version_info.h
+++ b/src/common/angle_version_info.h
@@ -5,8 +5,8 @@
//
// angle_version_info.h: ANGLE version queries.

-#ifndef COMMON_VERSION_H_
-#define COMMON_VERSION_H_
+#ifndef COMMON_VERSION_INFO_H_
+#define COMMON_VERSION_INFO_H_

namespace angle
{
@@ -17,4 +17,4 @@ int GetANGLECommitHashSize();
bool GetANGLEHasBinaryLoading();
} // namespace angle

-#endif // COMMON_VERSION_H_
+#endif // COMMON_VERSION_INFO_H_
diff --git a/src/common/apple_platform_utils.mm b/src/common/apple_platform_utils.mm
index a9757cbb72b7c75f155a1cfedd84a2e98120b564..eebe70cdcc3e1db0d7922f083ae9287b3c0cb16d 100644
--- a/src/common/apple_platform_utils.mm
Expand Down
6 changes: 3 additions & 3 deletions Source/ThirdParty/ANGLE/src/common/angle_version_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
//
// angle_version_info.h: ANGLE version queries.

#ifndef COMMON_VERSION_H_
#define COMMON_VERSION_H_
#ifndef COMMON_VERSION_INFO_H_
#define COMMON_VERSION_INFO_H_

namespace angle
{
Expand All @@ -17,4 +17,4 @@ int GetANGLECommitHashSize();
bool GetANGLEHasBinaryLoading();
} // namespace angle

#endif // COMMON_VERSION_H_
#endif // COMMON_VERSION_INFO_H_

0 comments on commit 1a61b3d

Please sign in to comment.