Dropped the * from gzFile *gzin_fd because gzFile is no longer defined as a void pointer.
Rearranged incldes in libgfs2/lang.c so parser.h gets passed struct lgfs2_lang_state correctly. Signed-off-by: Callum Massey <[email protected]> --- gfs2/edit/savemeta.c | 2 +- gfs2/libgfs2/lang.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index f35c35d..cfe18eb 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -831,7 +831,7 @@ void savemeta(char *out_fn, int saveoption, int gziplevel) exit(0); } -static int restore_data(int fd, gzFile *gzin_fd, int printblocksonly, +static int restore_data(int fd, gzFile gzin_fd, int printblocksonly, int find_highblk) { size_t rs; diff --git a/gfs2/libgfs2/lang.c b/gfs2/libgfs2/lang.c index ad9382f..40a4355 100644 --- a/gfs2/libgfs2/lang.c +++ b/gfs2/libgfs2/lang.c @@ -7,8 +7,8 @@ #include <limits.h> #include <ctype.h> -#include "parser.h" #include "lang.h" +#include "parser.h" const char* ast_type_string[] = { [AST_NONE] = "NONE", -- 1.8.0.2
