ObjFW  Diff

Differences From Artifact [8e9c5825f8]:

• File src/OFString+XMLUnescaping.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: 2661) [annotate] [blame] [check-ins using]

To Artifact [7a2761c9a2]:

• File src/OFString+XMLUnescaping.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: 2659) [annotate] [blame] [check-ins using]

33
34
35
36
37
38
39
40
41
42
43
44
45
46
47

 * @brief A block which is called to replace unknown XML entities in an XML
 *	  string.
 *
 * @param string The XML string which contains an unknown entity
 * @param entity The XML entity which is unknown
 * @return A replacement string for the unknown entity
 */
typedef OFString *OF_NULLABLE (^of_string_xml_unescaping_block_t)(
    OFString *string, OFString *entity);
#endif

/*!
 * @protocol OFStringXMLUnescapingDelegate OFString.h ObjFW/OFString.h
 *
 * @brief A protocol that needs to be implemented by delegates for

|

33
34
35
36
37
38
39
40
41
42
43
44
45
46
47

 * @brief A block which is called to replace unknown XML entities in an XML
 *	  string.
 *
 * @param string The XML string which contains an unknown entity
 * @param entity The XML entity which is unknown
 * @return A replacement string for the unknown entity
 */
typedef OFString *_Nullable (^of_string_xml_unescaping_block_t)(
    OFString *string, OFString *entity);
#endif

/*!
 * @protocol OFStringXMLUnescapingDelegate OFString.h ObjFW/OFString.h
 *
 * @brief A protocol that needs to be implemented by delegates for