Cargo cut a fix for the regressions r326585 caused.

We need to include ficl.h after the standard includes, rather than
before them. It changes the generated code in ways that haven't been
completely analyized. This restores the old code generation (as
verified by md5 changing back for zfsloader).

This should restore GPT + ZFS and GPT + ZFS + GELI booting that was
broken in r326585 (or would have been if r326584 hadn't broken the
build).

Sponsored by: Netflix
This commit is contained in:
imp 2017-12-14 16:51:26 +00:00
parent 9e63f130a7
commit 1ad8400681

View File

@ -43,13 +43,13 @@
/* $FreeBSD$ */
#include "ficl.h"
#if FICL_WANT_FLOAT
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "ficl.h"
#if FICL_WANT_FLOAT
#include <math.h>
/*******************************************************************