diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2014-07-06 00:09:27 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2014-07-06 00:09:27 -0400 |
| commit | 7f7d1cb462789eef8e359caa46523ed6b99255e1 (patch) | |
| tree | e23923e05256deb1712ff21d4799312a0a6f1142 /util/subst.c | |
| parent | 328731738d88eb6c32c784e7aa7871e576e9e8a5 (diff) | |
| parent | cd75fb04510073004f8ef005e06733813faad2de (diff) | |
| download | e2fsprogs-7f7d1cb462789eef8e359caa46523ed6b99255e1.tar.gz | |
Merge branch 'maint' into next
Conflicts:
debugfs/set_fields.c
tests/f_mmp/script
tests/f_mmp_garbage/script
tests/m_mmp/script
tests/t_mmp_1on/script
tests/t_mmp_2off/script
Diffstat (limited to 'util/subst.c')
| -rw-r--r-- | util/subst.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/util/subst.c b/util/subst.c index 32d52932..85020c95 100644 --- a/util/subst.c +++ b/util/subst.c @@ -5,7 +5,9 @@ * */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include <stdio.h> #include <errno.h> #include <stdlib.h> |