From 38cac2843e94f1ea88162b6c3f407a01500aad2e Mon Sep 17 00:00:00 2001
From: neil <neil@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Mon, 15 Sep 2014 16:02:02 +0000
Subject: [PATCH] bz2_au.library -> bz2.library

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@49635 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 workbench/c/Unpack/bzip2.h                 | 3 +--
 workbench/c/Unpack/unpack.c                | 8 ++------
 workbench/devs/diskimage/plugins/dmg/dmg.c | 4 +---
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/workbench/c/Unpack/bzip2.h b/workbench/c/Unpack/bzip2.h
index 8bd5d116fc..8ea6abb8d1 100644
--- a/workbench/c/Unpack/bzip2.h
+++ b/workbench/c/Unpack/bzip2.h
@@ -2,12 +2,11 @@
 #define PKG_BZIP2_H
 
 /*
-    Copyright © 2003, The AROS Development Team. All rights reserved.
+    Copyright © 2003-2014, The AROS Development Team. All rights reserved.
     $Id$
 */
 
 #include <exec/types.h>
-#include <proto/bz2_au.h>
 
 /****************************************************************************/
 /*** Prototypes *************************************************************/
diff --git a/workbench/c/Unpack/unpack.c b/workbench/c/Unpack/unpack.c
index 15483a48da..cb72455fc7 100644
--- a/workbench/c/Unpack/unpack.c
+++ b/workbench/c/Unpack/unpack.c
@@ -1,5 +1,5 @@
 /*
-    Copyright © 2003, 2009, The AROS Development Team. All rights reserved.
+    Copyright © 2003-2014, The AROS Development Team. All rights reserved.
     $Id$
 */
 
@@ -48,10 +48,6 @@
 
     INTERNALS
 
-    HISTORY
-
-    04.05.2000  SDuvan  implemented
-
 ******************************************************************************/
 
 #include <dos/dos.h>
@@ -90,7 +86,7 @@ AROS_SH2
 
     IntuitionBase = (struct IntuitionBase *)OpenLibrary( "intuition.library", 0 );
     GfxBase = (struct GfxBase *)OpenLibrary( "graphics.library", 0 );
-    BZ2Base = OpenLibrary( "bz2_au.library", 0 );
+    BZ2Base = OpenLibrary( "bz2.library", 0 );
     
     //Printf( "%s, %s\n", SHArg(FILE), SHArg(TO) );
     
diff --git a/workbench/devs/diskimage/plugins/dmg/dmg.c b/workbench/devs/diskimage/plugins/dmg/dmg.c
index 7e5401b29e..0c66e9032f 100644
--- a/workbench/devs/diskimage/plugins/dmg/dmg.c
+++ b/workbench/devs/diskimage/plugins/dmg/dmg.c
@@ -422,11 +422,9 @@ APTR DMG_OpenImage (struct DiskImagePlugin *Self, APTR unit, BPTR file,
 	}
 
 	if (image->uses_bzlib) {
+		image->bz2base = OpenLibrary("bz2.library", 1);
 #ifdef __AROS__
-		image->bz2base = OpenLibrary("bz2_au.library", 1);
 		BZ2Base = image->bz2base;
-#else
-		image->bz2base = OpenLibrary("bz2.library", 1);
 #endif
 		if (!image->bz2base) {
 			error = ERROR_OBJECT_NOT_FOUND;
-- 
2.11.4.GIT