Fix btrfs_shell build

The hacks to still use actual system headers for zlib didn't quite work.

- Define Z_SOLO, which makes zlib build without any system include
- Remove use of std::max and #include <algorithm> from AVLTree
- Do not include DebugSupport.h because it uses system headers
- Do not include uuid.h and define just what we need

Now it's possible to compile the btrfs_shell on Linux.

Change-Id: I74a14b5f6804db45ab5a9f582ab493d696376fd3
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2098
Reviewed-by: Adrien Destugues <[email protected]>

This commit is contained in:

Adrien Destugues

2020-01-25 11:58:15 +00:00

committed by

Adrien Destugues

parent 7b4d924f98

commit c5e9dd9b68

8 changed files with 41 additions and 14 deletions

									
										headers/private/kernel/util/AVLTreeBase.h
									
		-1
	
												View File
												
				@@ -9,7 +9,6 @@

				#ifndef FS_SHELL

				#	include <SupportDefs.h>

				#else

				#	include <algorithm>

				#	include "fssh_api_wrapper.h"

				#endif