Change some internal path names.
This is mostly to sync up with some changes from Google's internal
repositories; it does not affect the open-source distribution in itself.
diff --git a/COPYING b/COPYING
index 4816c43..bd0e597 100644
--- a/COPYING
+++ b/COPYING
@@ -29,7 +29,7 @@
===
-Some of the benchmark data in util/zippy/testdata is licensed differently:
+Some of the benchmark data in testdata/ is licensed differently:
- fireworks.jpeg is Copyright 2013 Steinar H. Gunderson, and
is licensed under the Creative Commons Attribution 3.0 license
diff --git a/snappy-c.h b/snappy-c.h
index c6c2a86..32aa0c6 100644
--- a/snappy-c.h
+++ b/snappy-c.h
@@ -30,8 +30,8 @@
* Plain C interface (a wrapper around the C++ implementation).
*/
-#ifndef UTIL_SNAPPY_OPENSOURCE_SNAPPY_C_H_
-#define UTIL_SNAPPY_OPENSOURCE_SNAPPY_C_H_
+#ifndef THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_C_H_
+#define THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_C_H_
#ifdef __cplusplus
extern "C" {
@@ -135,4 +135,4 @@
} // extern "C"
#endif
-#endif /* UTIL_SNAPPY_OPENSOURCE_SNAPPY_C_H_ */
+#endif /* THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_C_H_ */
diff --git a/snappy-internal.h b/snappy-internal.h
index c99d331..f3da93c 100644
--- a/snappy-internal.h
+++ b/snappy-internal.h
@@ -28,8 +28,8 @@
//
// Internals shared between the Snappy implementation and its unittest.
-#ifndef UTIL_SNAPPY_SNAPPY_INTERNAL_H_
-#define UTIL_SNAPPY_SNAPPY_INTERNAL_H_
+#ifndef THIRD_PARTY_SNAPPY_SNAPPY_INTERNAL_H_
+#define THIRD_PARTY_SNAPPY_SNAPPY_INTERNAL_H_
#include "snappy-stubs-internal.h"
@@ -147,4 +147,4 @@
} // end namespace internal
} // end namespace snappy
-#endif // UTIL_SNAPPY_SNAPPY_INTERNAL_H_
+#endif // THIRD_PARTY_SNAPPY_SNAPPY_INTERNAL_H_
diff --git a/snappy-sinksource.h b/snappy-sinksource.h
index faabfa1..bc4ac52 100644
--- a/snappy-sinksource.h
+++ b/snappy-sinksource.h
@@ -26,12 +26,11 @@
// (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 UTIL_SNAPPY_SNAPPY_SINKSOURCE_H_
-#define UTIL_SNAPPY_SNAPPY_SINKSOURCE_H_
+#ifndef THIRD_PARTY_SNAPPY_SNAPPY_SINKSOURCE_H_
+#define THIRD_PARTY_SNAPPY_SNAPPY_SINKSOURCE_H_
#include <stddef.h>
-
namespace snappy {
// A Sink is an interface that consumes a sequence of bytes.
@@ -131,7 +130,6 @@
char* dest_;
};
+} // namespace snappy
-}
-
-#endif // UTIL_SNAPPY_SNAPPY_SINKSOURCE_H_
+#endif // THIRD_PARTY_SNAPPY_SNAPPY_SINKSOURCE_H_
diff --git a/snappy-stubs-internal.h b/snappy-stubs-internal.h
index 12393b6..ddca1a8 100644
--- a/snappy-stubs-internal.h
+++ b/snappy-stubs-internal.h
@@ -28,8 +28,8 @@
//
// Various stubs for the open-source version of Snappy.
-#ifndef UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_INTERNAL_H_
-#define UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_INTERNAL_H_
+#ifndef THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_INTERNAL_H_
+#define THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_INTERNAL_H_
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -488,4 +488,4 @@
} // namespace snappy
-#endif // UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_INTERNAL_H_
+#endif // THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_INTERNAL_H_
diff --git a/snappy-stubs-public.h.in b/snappy-stubs-public.h.in
index 6c181a1..ebe676c 100644
--- a/snappy-stubs-public.h.in
+++ b/snappy-stubs-public.h.in
@@ -33,8 +33,8 @@
// which is a public header. Instead, snappy-stubs-public.h is generated by
// from snappy-stubs-public.h.in at configure time.
-#ifndef UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
-#define UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
+#ifndef THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
+#define THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
#if @ac_cv_have_stdint_h@
#include <stdint.h>
@@ -95,4 +95,4 @@
} // namespace snappy
-#endif // UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
+#endif // THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
diff --git a/snappy-test.h b/snappy-test.h
index 0f18bf1..519eec7 100644
--- a/snappy-test.h
+++ b/snappy-test.h
@@ -28,8 +28,8 @@
//
// Various stubs for the unit tests for the open-source version of Snappy.
-#ifndef UTIL_SNAPPY_OPENSOURCE_SNAPPY_TEST_H_
-#define UTIL_SNAPPY_OPENSOURCE_SNAPPY_TEST_H_
+#ifndef THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_TEST_H_
+#define THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_TEST_H_
#include <iostream>
#include <string>
@@ -579,4 +579,4 @@
using snappy::UncompressFile;
using snappy::MeasureFile;
-#endif // UTIL_SNAPPY_OPENSOURCE_SNAPPY_TEST_H_
+#endif // THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_TEST_H_
diff --git a/snappy.h b/snappy.h
index e879e79..4ac572f 100644
--- a/snappy.h
+++ b/snappy.h
@@ -36,8 +36,8 @@
// using BMDiff and then compressing the output of BMDiff with
// Snappy.
-#ifndef UTIL_SNAPPY_SNAPPY_H__
-#define UTIL_SNAPPY_SNAPPY_H__
+#ifndef THIRD_PARTY_SNAPPY_SNAPPY_H__
+#define THIRD_PARTY_SNAPPY_SNAPPY_H__
#include <stddef.h>
#include <string>
@@ -180,5 +180,4 @@
static const size_t kMaxHashTableSize = 1 << kMaxHashTableBits;
} // end namespace snappy
-
-#endif // UTIL_SNAPPY_SNAPPY_H__
+#endif // THIRD_PARTY_SNAPPY_SNAPPY_H__
