ObjFW  Diff

Differences From Artifact [7fb013ccb5]:

• File src/of_asprintf.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: 1045) [annotate] [blame] [check-ins using]

To Artifact [eedd732e01]:

• File src/of_asprintf.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: 1033) [annotate] [blame] [check-ins using]

27
28
29
30
31
32
33
34
35
36
37
38
39
40
41

OF_ASSUME_NONNULL_BEGIN

#ifdef __cplusplus
extern "C" {
#endif
extern int of_asprintf(
    char *OF_NULLABLE *OF_NONNULL, const char *OF_NONNULL, ...);
extern int of_vasprintf(
    char *OF_NULLABLE *OF_NONNULL, const char *OF_NONNULL, va_list);
#ifdef __cplusplus
}
#endif

OF_ASSUME_NONNULL_END

|

|

27
28
29
30
31
32
33
34
35
36
37
38
39
40
41

OF_ASSUME_NONNULL_BEGIN

#ifdef __cplusplus
extern "C" {
#endif
extern int of_asprintf(
    char *_Nullable *_Nonnull, const char *_Nonnull, ...);
extern int of_vasprintf(
    char *_Nullable *_Nonnull, const char *_Nonnull, va_list);
#ifdef __cplusplus
}
#endif

OF_ASSUME_NONNULL_END