ObjFW  Check-in [fd58565e71]

Overview
Comment:OFFileURLHandler: Fix #ifdef mismatch
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: fd58565e7157a5e712c973c18c7bf4cd32f75a74896f8a5c0a11fccf9477e7d8
User & Date: js on 2019-08-02 12:23:34
Other Links: manifest | tags
Context
2019-08-02
12:23
OFThread: Set main thread to running check-in: a2ab241bc7 user: js tags: trunk
12:23
OFFileURLHandler: Fix #ifdef mismatch check-in: fd58565e71 user: js tags: trunk
11:42
.travis.yml: Disable Xcode 11 & 32-bit Xcode 10.2 check-in: b373d2f8b9 user: js tags: trunk
Changes

Modified src/OFFileURLHandler.m from [1d7d83199f] to [a3ec7d4d97].

101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
#endif

#ifdef OF_WINDOWS
# define S_IFLNK 0x10000
# define S_ISLNK(mode) (mode & S_IFLNK)
#endif

#if defined(OF_HAVE_CHOWN) && defined(OF_HAVE_THREADS) && !defined(OF_AMIGAOS)
static OFMutex *passwdMutex;
#endif
#if !defined(HAVE_READDIR_R) && defined(OF_HAVE_THREADS) && !defined(OF_WINDOWS)
static OFMutex *readdirMutex;
#endif

#ifdef OF_WINDOWS







|







101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
#endif

#ifdef OF_WINDOWS
# define S_IFLNK 0x10000
# define S_ISLNK(mode) (mode & S_IFLNK)
#endif

#if defined(OF_FILE_MANAGER_SUPPORTS_OWNER) && defined(OF_HAVE_THREADS)
static OFMutex *passwdMutex;
#endif
#if !defined(HAVE_READDIR_R) && defined(OF_HAVE_THREADS) && !defined(OF_WINDOWS)
static OFMutex *readdirMutex;
#endif

#ifdef OF_WINDOWS
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548

	if ((ILocale = (struct LocaleIFace *)
	    GetInterface(LocaleBase, "main", 1, NULL)) == NULL)
		@throw [OFInitializationFailedException
		    exceptionWithClass: self];
#endif

#if defined(OF_HAVE_CHOWN) && defined(OF_HAVE_THREADS)
	passwdMutex = [[OFMutex alloc] init];
#endif
#if !defined(HAVE_READDIR_R) && !defined(OF_WINDOWS) && defined(OF_HAVE_THREADS)
	readdirMutex = [[OFMutex alloc] init];
#endif

#ifdef OF_WINDOWS







|







534
535
536
537
538
539
540
541
542
543
544
545
546
547
548

	if ((ILocale = (struct LocaleIFace *)
	    GetInterface(LocaleBase, "main", 1, NULL)) == NULL)
		@throw [OFInitializationFailedException
		    exceptionWithClass: self];
#endif

#if defined(OF_FILE_MANAGER_SUPPORTS_OWNER) && defined(OF_HAVE_THREADS)
	passwdMutex = [[OFMutex alloc] init];
#endif
#if !defined(HAVE_READDIR_R) && !defined(OF_WINDOWS) && defined(OF_HAVE_THREADS)
	readdirMutex = [[OFMutex alloc] init];
#endif

#ifdef OF_WINDOWS