summaryrefslogtreecommitdiff
path: root/src/os_vms_conf.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-03-12 16:51:55 +0100
committerBram Moolenaar <Bram@vim.org>2014-03-12 16:51:55 +0100
commit206f011829920e41c4d3782af7591da6e1b86655 (patch)
treee244183206e3bcf82829738bf2d0eca05c7f4baf /src/os_vms_conf.h
parentf7dc2b551708315a833fcb19c288759c277dcfe1 (diff)
downloadvim-git-206f011829920e41c4d3782af7591da6e1b86655.tar.gz
updated for version 7.4.197v7.4.197
Problem: Various problems on VMS. Solution: Fix several VMS problems. (Zoltan Arpadffy)
Diffstat (limited to 'src/os_vms_conf.h')
-rw-r--r--src/os_vms_conf.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/os_vms_conf.h b/src/os_vms_conf.h
index 4058e4a36..41728efe2 100644
--- a/src/os_vms_conf.h
+++ b/src/os_vms_conf.h
@@ -166,8 +166,6 @@
#undef HAVE_SYS_TIME_H
#undef HAVE_LOCALE_H
#define BROKEN_LOCALE
-#undef HAVE_ICONV_H
-#undef HAVE_ICONV
#undef DYNAMIC_ICONV
#undef HAVE_STRFTIME
#else
@@ -177,12 +175,18 @@
#define HAVE_SYS_TIME_H
#define HAVE_LOCALE_H
#define BROKEN_LOCALE
-#undef HAVE_ICONV_H
-#undef HAVE_ICONV
#undef DYNAMIC_ICONV
#define HAVE_STRFTIME
#endif
+#if defined(USE_ICONV)
+#define HAVE_ICONV_H
+#define HAVE_ICONV
+#else
+#undef HAVE_ICONV_H
+#undef HAVE_ICONV
+#endif
+
/* GUI support defines */
#if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK)
#define HAVE_X11