trawick 01/02/21 10:51:20
Modified: . configure.in
file_io/unix mktemp.c
include apr_general.h
Log:
don't compile mktemp.c unless we have to; it doesn't compile everywhere
as it stands now (e.g., Tru64)
Somebody with ReliantUNIX or some other box with no mkstemp() needs to
try it out now. I wonder where the prototype for mkstemp() comes from
on that platform.
Regarding my configure.in changes:
. The first parm to AC_CHECK_FUNCS() must be the name of the function.
. We weren't using the have_mkstemp shell variable anywhere so I stopped
setting it. If we need a symbol APR_HAVE_MKSTEMP later we will need
to resurrect the have_mkstemp shell variable.
Revision Changes Path
1.235 +1 -1 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- configure.in 2001/02/21 15:51:43 1.234
+++ configure.in 2001/02/21 18:51:07 1.235
@@ -273,7 +273,7 @@
fi
AC_CHECK_FUNCS(hstrerror)
AC_CHECK_FUNCS(memmove, [ have_memmove="1" ], [have_memmove="0" ])
-AC_CHECK_FUNCS(have_mkstemp, [ have_mkstemp="1" ], [have_mkstemp="0" ])
+AC_CHECK_FUNCS(mkstemp)
AC_SUBST(fork)
AC_SUBST(have_inet_addr)
1.2 +6 -0 apr/file_io/unix/mktemp.c
Index: mktemp.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/mktemp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mktemp.c 2001/02/21 15:51:42 1.1
+++ mktemp.c 2001/02/21 18:51:14 1.2
@@ -31,6 +31,10 @@
* SUCH DAMAGE.
*/
+#include "apr_private.h"
+
+#if !defined(HAVE_MKSTEMP)
+
#ifndef __warn_references
#define __warn_references(a,b)
#endif
@@ -215,3 +219,5 @@
}
/*NOTREACHED*/
}
+
+#endif /* !defined(HAVE_MKSTEMP) */
1.54 +0 -6 apr/include/apr_general.h
Index: apr_general.h
===================================================================
RCS file: /home/cvs/apr/include/apr_general.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- apr_general.h 2001/02/21 15:51:42 1.53
+++ apr_general.h 2001/02/21 18:51:17 1.54
@@ -143,12 +143,6 @@
#define memmove(a,b,c) bcopy(b,a,c)
#endif
-#if (!HAVE_MKSTEMP)
-#define mkstemp(a) ap_mkstemp(a)
-#define mkstemps(a,b) ap_mkstemp(a,b)
-#define mkdtemp(a) ap_mkdtemp(a)
-#endif
-
/**
* @package APR Random Functions
*/
