From owner-svn-src-all@freebsd.org  Wed Feb 24 02:52:51 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 456C3AB2FC5;
 Wed, 24 Feb 2016 02:52:51 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 179D41253;
 Wed, 24 Feb 2016 02:52:51 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1O2qoo0038419;
 Wed, 24 Feb 2016 02:52:50 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1O2qoXW038417;
 Wed, 24 Feb 2016 02:52:50 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201602240252.u1O2qoXW038417@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 24 Feb 2016 02:52:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295952 - head/sys/geom/uzip
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Feb 2016 02:52:51 -0000

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__ */