diff options
| author | Tom Rondeau | 2011-01-22 14:54:34 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-01-22 14:54:34 -0500 |
| commit | 9880d22f38e0f96116f0d7409ccbbd148c9db53d (patch) | |
| tree | deb9d99fb256e5a39d3edf0db2591aa1fb007a7d /volk | |
| parent | 5ad1695febf1f0ef2055693b3af385470c0f66a5 (diff) | |
| parent | ebb0f56da62e9ff16928b32cc525f24c93a99e0b (diff) | |
| download | gnuradio-9880d22f38e0f96116f0d7409ccbbd148c9db53d.tar.gz gnuradio-9880d22f38e0f96116f0d7409ccbbd148c9db53d.tar.bz2 gnuradio-9880d22f38e0f96116f0d7409ccbbd148c9db53d.zip | |
Merge branch 'mergeme/misc/mkdir_simplification' into next
Diffstat (limited to 'volk')
| -rw-r--r-- | volk/config/gr_pwin32.m4 | 13 | ||||
| -rw-r--r-- | volk/config/mkstemp.m4 | 11 |
2 files changed, 1 insertions, 23 deletions
diff --git a/volk/config/gr_pwin32.m4 b/volk/config/gr_pwin32.m4 index 7b99cba6b..b55bc64b1 100644 --- a/volk/config/gr_pwin32.m4 +++ b/volk/config/gr_pwin32.m4 @@ -1,6 +1,6 @@ # Check for (mingw)win32 POSIX replacements. -*- Autoconf -*- -# Copyright 2003,2004,2005 Free Software Foundation, Inc. +# Copyright 2003,2004,2005,2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -61,17 +61,6 @@ AC_TRY_LINK([ #include <windows.h> AC_MSG_RESULT(no) ) -dnl Under Win32, mkdir prototype in io.h has only one arg -AC_MSG_CHECKING(whether mkdir accepts only one arg) -AC_TRY_COMPILE([#include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h>], [ - mkdir("") - ], [ AC_MSG_RESULT(yes) - AC_DEFINE(MKDIR_TAKES_ONE_ARG,[],[Define if mkdir accepts only one arg]) ], - [ AC_MSG_RESULT(no) - ]) - AH_BOTTOM( [ /* Define missing prototypes, implemented in replacement lib */ diff --git a/volk/config/mkstemp.m4 b/volk/config/mkstemp.m4 index 4af0f0a9b..2d1fbee9b 100644 --- a/volk/config/mkstemp.m4 +++ b/volk/config/mkstemp.m4 @@ -75,15 +75,4 @@ AC_DEFUN([jm_PREREQ_TEMPNAME], AC_CHECK_FUNCS(__secure_getenv gettimeofday lstat) AC_CHECK_DECLS_ONCE(getenv) # AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) - - dnl Under Win32, mkdir prototype in io.h has only one arg - AC_MSG_CHECKING(whether mkdir accepts only one arg) - AC_TRY_COMPILE([#include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h>], [ - mkdir("") - ], [ AC_MSG_RESULT(yes) - AC_DEFINE(MKDIR_TAKES_ONE_ARG,[],[Define if mkdir accepts only one arg]) ], - [ AC_MSG_RESULT(no) - ]) ]) |