diff options
| author | cah <cth@carlh.net> | 2025-07-10 22:47:19 +0200 |
|---|---|---|
| committer | cah <cth@carlh.net> | 2025-07-10 22:47:19 +0200 |
| commit | 4be4e97abf911e7633172ada950d107a3ed28834 (patch) | |
| tree | c9deceb5f3684fa081db0613da88264732093fcb /src/lib/disk_writer_messages.h | |
| parent | 727c1aa7da8b325dfa38c8443b1dd356acaf6ec3 (diff) | |
| parent | 42bde2d97039f6d0d645d83db90612d18ebf225a (diff) | |
Merge branch 'compose-to-fmt-take2'
This removes all uses of String::compose, replacing them with fmt and
updating the i18n strings where required.
Diffstat (limited to 'src/lib/disk_writer_messages.h')
| -rw-r--r-- | src/lib/disk_writer_messages.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/disk_writer_messages.h b/src/lib/disk_writer_messages.h index 2fa225d85..205b2420d 100644 --- a/src/lib/disk_writer_messages.h +++ b/src/lib/disk_writer_messages.h @@ -23,6 +23,10 @@ #include <string> +/* windows.h defines this but we want to use it */ +#undef ERROR + + class Nanomsg; |