Fixes to make it compile under gcc-4.2.

This commit is contained in:
Adrian Chadd 2016-02-24 02:52:49 +00:00
parent 24b6748c42
commit 443a0f85dd
2 changed files with 6 additions and 4 deletions

View File

@ -43,8 +43,6 @@ __FBSDID("$FreeBSD$");
#include <geom/geom.h>
MALLOC_DEFINE(M_GEOM_UZIP, "geom_uzip", "GEOM UZIP data structures");
#include <geom/uzip/g_uzip.h>
#include <geom/uzip/g_uzip_cloop.h>
#include <geom/uzip/g_uzip_softc.h>
@ -53,6 +51,8 @@ MALLOC_DEFINE(M_GEOM_UZIP, "geom_uzip", "GEOM UZIP data structures");
#include <geom/uzip/g_uzip_lzma.h>
#include <geom/uzip/g_uzip_wrkthr.h>
MALLOC_DEFINE(M_GEOM_UZIP, "geom_uzip", "GEOM UZIP data structures");
FEATURE(geom_uzip, "GEOM read-only compressed disks support");
struct g_uzip_blk {

View File

@ -27,9 +27,11 @@
*
* $FreeBSD$
*/
#ifndef __GEOM_G_UZIP_H__
#define __GEOM_G_UZIP_H__
#if !defined(M_GEOM_UZIP)
MALLOC_DECLARE(M_GEOM_UZIP);
#endif
#define DEFINE_RAW_METHOD(func, rval, args...) typedef rval (*func##_t)(args)
#endif /* __GEOM_G_UZIP_H__ */