summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/if_ruby.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c
index 2727524f89..6779c23438 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -118,8 +118,11 @@
#ifdef RUBY19_OR_LATER
# include <ruby/encoding.h>
#endif
+#ifndef RUBY19_OR_LATER
+# include <st.h> // for ST_STOP and ST_CONTINUE
+#endif
-#undef off_t /* ruby defines off_t as _int64, Mingw uses long */
+#undef off_t // ruby defines off_t as _int64, Mingw uses long
#undef EXTERN
#undef _
diff --git a/src/version.c b/src/version.c
index bc12aae17c..54c15f3108 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1174,
+/**/
1173,
/**/
1172,