ObjFW  Diff

Differences From Artifact [a0120e2911]:

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

To Artifact [2b094f8687]:

• File src/OFHTTPRequest.h — part of check-in [80e1a9655b] at 2015-06-17 22:11:31 on branch trunk — Add OF_NULLABLE_PROPERTY

  This is necessary to make GCC (>= 4.6 and Apple GCC) happy as they don't
  like the list of property attributes ending in a comma. (user: js, size: 6677) [annotate] [blame] [check-ins using]

80
81
82
83
84
85
86

87
88
89
90
91
92
93
94
95
96
97

	OFString *_remoteAddress;
}

#ifdef OF_HAVE_PROPERTIES
@property (copy) OFURL *URL;
@property of_http_request_method_t method;
@property of_http_request_protocol_version_t protocolVersion;

@property (copy, nullable) OFDictionary OF_GENERIC(OFString*, OFString*)
    *headers;
@property (retain, nullable) OFDataArray *body;
@property (copy, nullable) OFString *remoteAddress;
#endif

/*!
 * @brief Creates a new OFHTTPRequest.
 *
 * @return A new, autoreleased OFHTTPRequest
 */

>
|
<
|
|

80
81
82
83
84
85
86
87
88

89
90
91
92
93
94
95
96
97

	OFString *_remoteAddress;
}

#ifdef OF_HAVE_PROPERTIES
@property (copy) OFURL *URL;
@property of_http_request_method_t method;
@property of_http_request_protocol_version_t protocolVersion;
@property OF_NULLABLE_PROPERTY (copy)
    OFDictionary OF_GENERIC(OFString*, OFString*) *headers;

@property OF_NULLABLE_PROPERTY (retain) OFDataArray *body;
@property OF_NULLABLE_PROPERTY (copy) OFString *remoteAddress;
#endif

/*!
 * @brief Creates a new OFHTTPRequest.
 *
 * @return A new, autoreleased OFHTTPRequest
 */