summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2005-10-22 18:37:56 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2005-10-22 18:37:56 (GMT)
commitd2f2b5090cec5a75697dd5db04ede7ee0fa6d687 (patch)
treedb3c3ee7d1a601608eabbf383f36a8aa2067c47e
parente3d9211fa94de3e43908368e5e313930c8cea18c (diff)
downloadhdf5-d2f2b5090cec5a75697dd5db04ede7ee0fa6d687.zip
hdf5-d2f2b5090cec5a75697dd5db04ede7ee0fa6d687.tar.gz
hdf5-d2f2b5090cec5a75697dd5db04ede7ee0fa6d687.tar.bz2
[svn-r11598] Purpose:
Code cleanup Description: Take out odd definition of HDalarm() and replace with standard macro like the rest of the library. Platforms tested: FreeBSD 4.11 (sleipnir) Too minor to require h5committest
-rw-r--r--src/H5.c12
-rw-r--r--src/H5private.h8
2 files changed, 5 insertions, 15 deletions
diff --git a/src/H5.c b/src/H5.c
index 51f81ea..cd4d2a2 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -830,18 +830,6 @@ HDvsnprintf(char *buf, size_t UNUSED size, const char *fmt, va_list ap)
#endif /* H5_HAVE_VSNPRINTF */
#endif /* __PUMAGON__ */
-#ifndef H5_HAVE_ALARM
-#ifdef WIN32
-unsigned int HDalarm(N) {
- return 0;
-}
-#endif
-#else
-unsigned int HDalarm(unsigned int N) {
- return alarm(N);
-}
-#endif
-
/*-------------------------------------------------------------------------
* Function: HDfprintf
diff --git a/src/H5private.h b/src/H5private.h
index 11ff2f6..9b45463 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -545,6 +545,11 @@ H5_DLL void H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds);
#define HDabs(X) abs(X)
#define HDaccess(F,M) access(F, M)
#define HDacos(X) acos(X)
+#ifdef H5_HAVE_ALARM
+#define HDalarm(N) alarm(N)
+#else /* H5_HAVE_ALARM */
+#define HDalarm(N) (0)
+#endif /* H5_HAVE_ALARM */
#define HDasctime(T) asctime(T)
#define HDasin(X) asin(X)
#define HDassert(X) assert(X)
@@ -1393,7 +1398,4 @@ H5_DLL int H5S_term_interface(void);
H5_DLL int H5T_term_interface(void);
H5_DLL int H5Z_term_interface(void);
-/* Define alarm function since windows doesn't support alarm function*/
-H5_DLL unsigned int HDalarm(unsigned int N);
-
#endif