File tree Expand file tree Collapse file tree 2 files changed +10
-11
lines changed Expand file tree Collapse file tree 2 files changed +10
-11
lines changed Original file line number Diff line number Diff line change @@ -407,7 +407,6 @@ CHECK_FUNCTION_EXISTS (pthread_sigmask HAVE_PTHREAD_SIGMASK)
407
407
CHECK_FUNCTION_EXISTS (pthread_threadmask HAVE_PTHREAD_THREADMASK )
408
408
CHECK_FUNCTION_EXISTS (pthread_yield_np HAVE_PTHREAD_YIELD_NP )
409
409
CHECK_FUNCTION_EXISTS (putenv HAVE_PUTENV )
410
- CHECK_FUNCTION_EXISTS (readdir_r HAVE_READDIR_R )
411
410
CHECK_FUNCTION_EXISTS (readlink HAVE_READLINK )
412
411
CHECK_FUNCTION_EXISTS (re_comp HAVE_RE_COMP )
413
412
CHECK_FUNCTION_EXISTS (regcomp HAVE_REGCOMP )
@@ -465,6 +464,16 @@ IF(HAVE_SYS_EVENT_H)
465
464
CHECK_FUNCTION_EXISTS (kqueue HAVE_KQUEUE )
466
465
ENDIF ()
467
466
467
+ # readdir_r might exist, but be marked deprecated
468
+ SET (CMAKE_REQUIRED_FLAGS -Werror )
469
+ CHECK_CXX_SOURCE_COMPILES (
470
+ "#include <dirent.h>
471
+ int main() {
472
+ readdir_r(0,0,0);
473
+ return 0;
474
+ }" HAVE_READDIR_R )
475
+ SET (CMAKE_REQUIRED_FLAGS )
476
+
468
477
#--------------------------------------------------------------------
469
478
# Support for WL#2373 (Use cycle counter for timing)
470
479
#--------------------------------------------------------------------
Original file line number Diff line number Diff line change @@ -103,10 +103,6 @@ MY_DIR *my_dir(const char *path, myf MyFlags)
103
103
DBUG_ENTER ("my_dir" );
104
104
DBUG_PRINT ("my" ,("path: '%s' MyFlags: %d" ,path ,MyFlags ));
105
105
106
- #if !defined(HAVE_READDIR_R )
107
- mysql_mutex_lock (& THR_LOCK_open );
108
- #endif
109
-
110
106
dirp = opendir (directory_file_name (tmp_path ,(char * ) path ));
111
107
#if defined(__amiga__ )
112
108
if ((dirp -> dd_fd ) < 0 ) /* Directory doesn't exists */
@@ -162,9 +158,6 @@ MY_DIR *my_dir(const char *path, myf MyFlags)
162
158
}
163
159
164
160
(void ) closedir (dirp );
165
- #if !defined(HAVE_READDIR_R )
166
- mysql_mutex_unlock (& THR_LOCK_open );
167
- #endif
168
161
result -> dir_entry = (FILEINFO * )dir_entries_storage -> buffer ;
169
162
result -> number_off_files = dir_entries_storage -> elements ;
170
163
@@ -174,9 +167,6 @@ MY_DIR *my_dir(const char *path, myf MyFlags)
174
167
DBUG_RETURN (result );
175
168
176
169
error :
177
- #if !defined(HAVE_READDIR_R )
178
- mysql_mutex_unlock (& THR_LOCK_open );
179
- #endif
180
170
my_errno = errno ;
181
171
if (dirp )
182
172
(void ) closedir (dirp );
You can’t perform that action at this time.
0 commit comments