Author: adrian
Date: Wed Feb 24 02:52:49 2016
New Revision: 295952
URL: https://svnweb.freebsd.org/changeset/base/295952
Log:
Fixes to make it compile under gcc-4.2.
Modified:
head/sys/geom/uzip/g_uzip.c
head/sys/geom/uzip/g_uzip.h
Modified: head/sys/geom/uzip/g_uzip.c
==============================================================================
--- head/sys/geom/uzip/g_uzip.c Wed Feb 24 02:34:11 2016 (r295951)
+++ head/sys/geom/uzip/g_uzip.c Wed Feb 24 02:52:49 2016 (r295952)
@@ -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",
#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 {
Modified: head/sys/geom/uzip/g_uzip.h
==============================================================================
--- head/sys/geom/uzip/g_uzip.h Wed Feb 24 02:34:11 2016 (r295951)
+++ head/sys/geom/uzip/g_uzip.h Wed Feb 24 02:52:49 2016 (r295952)
@@ -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__ */
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
