From ebae3f7ed3aa4e6903e1d95bfc39603b6ad708a5 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Mon, 28 Oct 2013 21:21:19 +0000 Subject: [PATCH] use g_mkdir() we had our own compat stuff, use the g_() one instead --- configure.ac | 1 - libvips/iofuncs/util.c | 19 +------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index 3cb0e2c3..faa981a4 100644 --- a/configure.ac +++ b/configure.ac @@ -306,7 +306,6 @@ AC_TYPE_SIZE_T # Checks for library functions. AC_FUNC_MEMCMP AC_FUNC_MMAP -AC_FUNC_MKDIR AC_FUNC_VPRINTF AC_CHECK_FUNCS([getcwd gettimeofday getwd memset munmap putenv realpath strcasecmp strchr strcspn strdup strerror strrchr strspn vsnprintf realpath mkstemp mktemp random rand sysconf atexit]) AC_CHECK_LIB(m,cbrt,[AC_DEFINE(HAVE_CBRT,1,[have cbrt() in libm.])]) diff --git a/libvips/iofuncs/util.c b/libvips/iofuncs/util.c index 3dd447dd..98807648 100644 --- a/libvips/iofuncs/util.c +++ b/libvips/iofuncs/util.c @@ -1185,23 +1185,6 @@ vips_popenf( const char *fmt, const char *mode, ... ) return( fp ); } -/* Handle broken mkdirs() - */ -#if HAVE_MKDIR -# if MKDIR_TAKES_ONE_ARG - /* Mingw32 */ -# define mkdir(a,b) mkdir(a) -# endif -#else -# ifdef HAVE__MKDIR - /* plain Win32 */ -# include -# define mkdir(a,b) _mkdir(a) -# else -# error "Don't know how to create a directory on this system." -# endif -#endif - /* Make a directory. */ int @@ -1216,7 +1199,7 @@ vips_mkdirf( const char *name, ... ) /* Try that. */ - if( mkdir( buf1, 0755 ) ) { + if( g_mkdir( buf1, 0755 ) ) { vips_error( "mkdirf", _( "unable to create directory \"%s\", %s" ), buf1, strerror( errno ) );