Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs

Conflicts:
	source4/main.mk

1 files changed, 0 insertions, 50 deletions

diff --git a/source4/lib/compression/lzxpress.h b/source4/lib/compression/lzxpress.h
deleted file mode 100644
index df0ee59a0e..0000000000
--- a/source4/lib/compression/lzxpress.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) Matthieu Suiche 2008
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the author nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef _LZXPRESS_H
-#define _LZXPRESS_H
-
-#define XPRESS_BLOCK_SIZE 0x10000
-
-ssize_t lzxpress_compress(const uint8_t *uncompressed,
-			  uint32_t uncompressed_size,
-			  uint8_t *compressed,
-			  uint32_t max_compressed_size);
-
-ssize_t lzxpress_decompress(const uint8_t *input,
-			    uint32_t input_size,
-			    uint8_t *output,
-			    uint32_t max_output_size);
-
-#endif /* _LZXPRESS_H */