ObjFW  Diff

Differences From Artifact [2ef46745a0]:

• File src/macros.h — part of check-in [1ba08eebc5] at 2015-10-19 22:15:13 on branch trunk — Add platform.h & make platform defines consistent (user: js, size: 14111) [annotate] [blame] [check-ins using]

To Artifact [9c39f051f0]:

• File src/macros.h — part of check-in [d526d938d7] at 2015-11-21 18:35:39 on branch trunk — Remove OF_NULLABLE / OF_NONNULL

  Now that Clang switched to use _Nullable and _Nonnull instead of
  __nullable / __nonnull, there is no longer a conflict with glibc, which
  means we can just define _Nullable / _Nonnull to nothing if they are not
  understood by the compiler (which did not work with __nullable /
  __nonnull due to this conflict).

  This also defines _Null_unspecified to nothing if unavailable. (user: js, size: 14074) [annotate] [blame] [check-ins using]

166
167
168
169
170
171
172
173
174
175
176
177
178
179
180

181
182
183
184
185
186
187

#else
# define OF_GENERIC(...)
#endif

#if __has_feature(nullability)
# define OF_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
# define OF_ASSUME_NONNULL_END _Pragma("clang assume_nonnull end")
# define OF_NONNULL _Nonnull
# define OF_NULLABLE _Nullable
# define OF_NULLABLE_PROPERTY(...) (__VA_ARGS__, nullable)
#else
# define OF_ASSUME_NONNULL_BEGIN
# define OF_ASSUME_NONNULL_END
# define OF_NONNULL
# define OF_NULLABLE

# define OF_NULLABLE_PROPERTY
# define nonnull
# define nullable
#endif

#if __has_feature(objc_kindof)
# define OF_KINDOF(cls) __kindof cls

<
<




|
|
>

166
167
168
169
170
171
172


173
174
175
176
177
178
179
180
181
182
183
184
185
186

#else
# define OF_GENERIC(...)
#endif

#if __has_feature(nullability)
# define OF_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
# define OF_ASSUME_NONNULL_END _Pragma("clang assume_nonnull end")


# define OF_NULLABLE_PROPERTY(...) (__VA_ARGS__, nullable)
#else
# define OF_ASSUME_NONNULL_BEGIN
# define OF_ASSUME_NONNULL_END
# define _Nonnull
# define _Nullable
# define _Null_unspecified
# define OF_NULLABLE_PROPERTY
# define nonnull
# define nullable
#endif

#if __has_feature(objc_kindof)
# define OF_KINDOF(cls) __kindof cls