Differences From Artifact [efd0ac2883]:
- File src/OFApplication.h — part of check-in [9e76144ef8] at 2015-06-13 22:26:05 on branch trunk — Add support for and use the new nullability (user: js, size: 7038) [annotate] [blame] [check-ins using]
To Artifact [e950676ac5]:
- File
src/OFApplication.h
— part of check-in
[b7097a67b6]
at
2015-06-14 10:45:10
on branch trunk
— Add OF_NONNULL / OF_NULLABLE and use that instead
Using __nonnull directly doesn't work on systems using glibc, as glibc
defines __nonnull as a parameterized define. While this does not fix the
problem of Clang introducing __nonnull even though it conflicts with
glibc, this at least means it's possible again to compile things with
versions of Clang that don't support __nonnull on systems with glibc. (user: js, size: 7046) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
180 181 182 183 184 185 186 | /*! * @brief Gets args and argv. * * @param argc A pointer where a pointer to argc should be stored * @param argv A pointer where a pointer to argv should be stored */ | | | | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | /*! * @brief Gets args and argv. * * @param argc A pointer where a pointer to argc should be stored * @param argv A pointer where a pointer to argv should be stored */ - (void)getArgumentCount: (int *OF_NONNULL *OF_NONNULL)argc andArgumentValues: (char *OF_NONNULL *OF_NONNULL *OF_NONNULL[])argv; /*! * @brief Returns the name of the program (argv[0]). * * @return The name of the program (argv[0]) */ - (OFString*)programName; |
︙ | ︙ | |||
237 238 239 240 241 242 243 | @interface OFObject (OFApplicationDelegate) <OFApplicationDelegate> @end #ifdef __cplusplus extern "C" { #endif | | | 237 238 239 240 241 242 243 244 245 246 247 248 249 250 | @interface OFObject (OFApplicationDelegate) <OFApplicationDelegate> @end #ifdef __cplusplus extern "C" { #endif extern int of_application_main(int *OF_NONNULL, char *OF_NONNULL *OF_NONNULL[], Class); #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END |