Skip to content

Commit 0f5703a

Browse files
committed
address review comments
1 parent 67e6753 commit 0f5703a

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

Modules/_uuidmodule.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
static PyObject *
88
py_uuid_generate_time_safe(void)
99
{
10-
#if defined(HAVE_UUID_GENERATE_TIME_SAFE) && HAVE_UUID_GENERATE_TIME_SAFE
10+
#ifdef HAVE_UUID_GENERATE_TIME_SAFE
1111
uuid_t out;
1212
int res;
1313

@@ -38,7 +38,7 @@ PyInit__uuid(void)
3838
{
3939
PyObject *mod;
4040
assert(sizeof(uuid_t) == 16);
41-
#if defined(HAVE_UUID_GENERATE_TIME_SAFE) && HAVE_UUID_GENERATE_TIME_SAFE
41+
#ifdef HAVE_UUID_GENERATE_TIME_SAFE
4242
int has_uuid_generate_time_safe = 1;
4343
#else
4444
int has_uuid_generate_time_safe = 0;

configure

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9552,10 +9552,6 @@ if test "$ax_cv_uuid_generate_time_safe" = yes; then :
95529552

95539553
$as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h
95549554

9555-
else
9556-
9557-
$as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 0" >>confdefs.h
9558-
95599555
fi
95609556

95619557
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5

configure.ac

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2688,8 +2688,7 @@ AC_CACHE_CHECK([if uuid_generate_time_safe() available],
26882688
[ax_cv_uuid_generate_time_safe=no],
26892689
[AC_MSG_WARN([test program execution failed])])])
26902690
AS_IF([test "$ax_cv_uuid_generate_time_safe" = yes],
2691-
[AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1], [Define if uuid_generate_time_safe() exists.])],
2692-
[AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [0], [Define if uuid_generate_time_safe() exists.])])
2691+
[AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1], [Define if uuid_generate_time_safe() exists.])])
26932692

26942693
AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
26952694
# posix4 on Solaris 2.6

0 commit comments

Comments
 (0)