Skip to content

Commit 4c56752

Browse files
committed
Remove single underscore version defines
These were inconsistent and have been deprecated for a long time. Signed-off-by: Keith Packard <[email protected]>
1 parent 4e3b01b commit 4c56752

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

meson.build

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,14 +1509,7 @@ conf_data.set('__PICOLIBC__', version_array[0], description: 'The Picolibc major
15091509
conf_data.set('__PICOLIBC_MINOR__', version_array[1], description: 'The Picolibc minor version number.')
15101510
conf_data.set('__PICOLIBC_PATCHLEVEL__', picolibc_patch_level, description: 'The Picolibc patch level.')
15111511

1512-
# Old version macros. These have just a single leading underscore,
1513-
# which isn't consistent with the newlib macros; they were created
1514-
# by mistake.
1515-
conf_data.set('_PICOLIBC_VERSION', '"@0@"'.format(meson.project_version()), description: 'The Picolibc version in string format.')
1516-
conf_data.set('_PICOLIBC__', version_array[0], description: 'The Picolibc major version number.')
1517-
conf_data.set('_PICOLIBC_MINOR__', version_array[1], description: 'The Picolibc minor version number.')
1518-
1519-
conf_data.set('_NEWLIB_VERSION', '"@0@"'.format(NEWLIB_VERSION), description: 'The newlib version in string format.')
1512+
conf_data.set('__NEWLIB_VERSION__', '"@0@"'.format(NEWLIB_VERSION), description: 'The newlib version in string format.')
15201513
conf_data.set('__NEWLIB__', NEWLIB_MAJOR_VERSION, description: 'The newlib major version number.')
15211514
conf_data.set('__NEWLIB_MINOR__', NEWLIB_MINOR_VERSION, description: 'The newlib minor version number.')
15221515
conf_data.set('__NEWLIB_PATCHLEVEL__', NEWLIB_PATCHLEVEL_VERSION, description: 'The newlib patch level.')

0 commit comments

Comments
 (0)