diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-25 14:50:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-25 14:50:38 +0200 |
| commit | 679633f50538f615dab70c070402970fef298a6c (patch) | |
| tree | 455805c3a8c1d81fce06bdfe2c4748da41b1aea1 /core/string/ustring.h | |
| parent | 18596f6b3dd8a3bda04d0367d37f94c579a8a6e7 (diff) | |
| parent | 90019676b076abdfc076ed6f38005d6cce89923b (diff) | |
Merge pull request #63368 from akien-mga/fix_header_guards
Code quality: Fix header guards consistency
Diffstat (limited to 'core/string/ustring.h')
| -rw-r--r-- | core/string/ustring.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/string/ustring.h b/core/string/ustring.h index 1b8bf3d234..7672663964 100644 --- a/core/string/ustring.h +++ b/core/string/ustring.h @@ -28,9 +28,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +// Note: _GODOT suffix added to avoid conflict with ICU header with the same guard. + #ifndef USTRING_GODOT_H #define USTRING_GODOT_H -// Note: Renamed to avoid conflict with ICU header with the same name. #include "core/string/char_utils.h" #include "core/templates/cowdata.h" |