windows: effectively revert r32449
The _strdup usage in opal/util/basename looks like it was a product of Windows compatibility (see r11336), which we don't care about any more. Further, opal/win32/win_compat.h, which we sitll maintain for cygwin compatibility, #define's strdup to _strdup (which is what Microsoft wants you to use). So this old _strdup in opal/util/basename.c (and its corresponding check in configure.ac) should just be removed. This commit was SVN r32450. The following SVN revision numbers were found above: r11336 --> open-mpi/ompi@a28b025150 r32449 --> open-mpi/ompi@d5a3448b8b
Этот коммит содержится в:
родитель
d5a3448b8b
Коммит
eefa17026d
@ -875,7 +875,7 @@ OPAL_SEARCH_LIBS_CORE([dirname], [gen])
|
||||
# Darwin doesn't need -lm, as it's a symlink to libSystem.dylib
|
||||
OPAL_SEARCH_LIBS_CORE([ceil], [m])
|
||||
|
||||
AC_CHECK_FUNCS([asprintf snprintf vasprintf vsnprintf openpty isatty getpwuid fork waitpid execve pipe ptsname setsid mmap tcgetpgrp posix_memalign strsignal sysconf syslog vsyslog regcmp regexec regfree _NSGetEnviron socketpair strncpy_s _strdup usleep mkfifo dbopen dbm_open statfs statvfs setpgid])
|
||||
AC_CHECK_FUNCS([asprintf snprintf vasprintf vsnprintf openpty isatty getpwuid fork waitpid execve pipe ptsname setsid mmap tcgetpgrp posix_memalign strsignal sysconf syslog vsyslog regcmp regexec regfree _NSGetEnviron socketpair strncpy_s usleep mkfifo dbopen dbm_open statfs statvfs setpgid])
|
||||
|
||||
# Sanity check: ensure that we got at least one of statfs or statvfs.
|
||||
if test $ac_cv_func_statfs = no -a $ac_cv_func_statvfs = no; then
|
||||
|
@ -9,7 +9,7 @@
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved
|
||||
* Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2014 Research Organization for Information Science
|
||||
* and Technology (RIST). All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
@ -25,9 +25,6 @@
|
||||
#ifdef HAVE_STRING_H
|
||||
#include <string.h>
|
||||
#endif /* HAVE_STRING_H */
|
||||
#ifdef HAVE__STRDUP
|
||||
char * _strdup (const char *);
|
||||
#endif /* HAVE__STRDUP */
|
||||
#ifdef HAVE_LIBGEN_H
|
||||
#include <libgen.h>
|
||||
#endif /* HAVE_LIBGEN_H */
|
||||
@ -133,10 +130,6 @@ char* opal_dirname(const char* filename)
|
||||
break; /* return the duplicate of "." */
|
||||
}
|
||||
}
|
||||
#ifdef HAVE__STRDUP
|
||||
return _strdup(".");
|
||||
#else
|
||||
return strdup(".");
|
||||
#endif
|
||||
#endif /* defined(HAVE_DIRNAME) */
|
||||
}
|
||||
|
@ -9,6 +9,7 @@
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -246,8 +247,6 @@ typedef unsigned int uint;
|
||||
#define HAVE_DECL___FUNC__ 1
|
||||
#endif
|
||||
|
||||
/* Microsoft claim that strdup is deprecated and that we should use _strdup. */
|
||||
/*#define strdup _strdup*/
|
||||
/*#define strncpy strncpy_s*/
|
||||
/*#define sprintf sprintf_s*/
|
||||
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user