diff --git a/configure.in b/configure.in
index 4659ecedea..61ddc53352 100644
--- a/configure.in
+++ b/configure.in
@@ -4386,6 +4386,11 @@ if test "$wxUSE_FILE" = "yes"; then
     AC_CHECK_FUNCS(fsync)
 fi
 
+AC_CHECK_FUNCS(round)
+if test "$ac_cv_func_round" = yes; then
+    AC_CHECK_DECLS(round,,,[#include <math.h>])
+fi
+
 
 dnl the following tests are for Unix(like) systems only
 if test "$TOOLKIT" != "MSW"; then
diff --git a/include/wx/math.h b/include/wx/math.h
index e99b37a6d6..de561737dd 100644
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -105,13 +105,12 @@
 
     inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); }
 
-    #ifdef __VMS
-        //Missing definition in OpenVMS C++ header files.
-        double round(double __x);
+    #if defined(HAVE_ROUND) && !defined(HAVE_DECL_ROUND)
+        extern "C" double round(double);
     #endif
     inline int wxRound(double x)
     {
-        #ifdef __VMS
+        #if defined(HAVE_ROUND)
             return int(round(x));
         #else
             return (int)(x < 0 ? x - 0.5 : x + 0.5);