Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix up after eb28bf1
Aparently, HAVE_SYS_SOCKET_H seems to be used.
remove the strtok_r define from my_global.h, it is not used anywhere in code.
  • Loading branch information
vaintroub committed Jan 17, 2019
1 parent eb28bf1 commit 5d5f715
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 1 addition & 0 deletions cmake/CheckIncludeFiles.cmake
Expand Up @@ -41,6 +41,7 @@ CHECK_INCLUDE_FILES (strings.h HAVE_STRINGS_H)

CHECK_INCLUDE_FILES (sys/ioctl.h HAVE_SYS_IOCTL_H)
CHECK_INCLUDE_FILES (sys/select.h HAVE_SYS_SELECT_H)
CHECK_INCLUDE_FILES (sys/socket.h HAVE_SYS_SOCKET_H)
CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H)
CHECK_INCLUDE_FILES (sys/un.h HAVE_SYS_UN_H)
CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)
Expand Down
3 changes: 0 additions & 3 deletions include/ma_global.h
Expand Up @@ -492,9 +492,6 @@ extern double my_atof(const char*);
#define ulong_to_double(X) ((double) (ulong) (X))
#define SET_STACK_SIZE(X) /* Not needed on real machines */

#if !defined(HAVE_mit_thread) && !defined(HAVE_STRTOK_R)
#define strtok_r(A,B,C) strtok((A),(B))
#endif

#ifdef HAVE_LINUXTHREADS
/* #define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C)) */
Expand Down

0 comments on commit 5d5f715

Please sign in to comment.