ObjFW  Diff

Differences From 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]

To Artifact [ed8ed6f607]:

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

131
132
133
134
135
136
137
138
139
140
141
142
143
144
145

}

#ifdef OF_HAVE_PROPERTIES
@property (readonly, copy, nonatomic) OFString *programName;
@property (readonly, copy, nonatomic) OFArray OF_GENERIC(OFString*) *arguments;
@property (readonly, copy, nonatomic)
    OFDictionary OF_GENERIC(OFString*, OFString*) *environment;
@property (assign, nullable) id <OFApplicationDelegate> delegate;
#endif

/*!
 * @brief Returns the only OFApplication instance in the application.
 *
 * @return The only OFApplication instance in the application
 */

|

131
132
133
134
135
136
137
138
139
140
141
142
143
144
145

}

#ifdef OF_HAVE_PROPERTIES
@property (readonly, copy, nonatomic) OFString *programName;
@property (readonly, copy, nonatomic) OFArray OF_GENERIC(OFString*) *arguments;
@property (readonly, copy, nonatomic)
    OFDictionary OF_GENERIC(OFString*, OFString*) *environment;
@property OF_NULLABLE_PROPERTY (assign) id <OFApplicationDelegate> delegate;
#endif

/*!
 * @brief Returns the only OFApplication instance in the application.
 *
 * @return The only OFApplication instance in the application
 */