old MSVC's do not recognize '#error'.

git-svn-id: svn://tug.org/texlive/trunk@28414 c570f23f-e606-0410-a88d-b1316a301751

14 files changed, 175 insertions, 0 deletions

diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 6710db8a21e..418d9356fc5 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-02  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* hb-blob.h hb-buffer.h hb-common.h hb-font.h hb-ot-layout.h
+	hb-ot-tag.h hb-set.h hb-shape-plan.h hb-shape.h hb-unicode.h
+	hb-version.h.in in harfbuzz-0.9.7/src: disable '#error' for MSVC.
+	
 2012-11-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import harfbuzz-0.9.7.
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/ChangeLog
index a3ecac22094..962d172e968 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-02  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* patch-02-oldmsvc (new): #error is not recognized by old msvcs.
+
 2012-11-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-01-Khaled (new): Partial update from git, from Khaled.
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/patch-02-oldmsvc b/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/patch-02-oldmsvc
new file mode 100644
index 00000000000..5a125d74da4
--- /dev/null
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/patch-02-oldmsvc
@@ -0,0 +1,143 @@
+diff -u src-orig/hb-blob.h src/hb-blob.h
+--- src-orig/hb-blob.h	Fri Nov 30 19:42:46 2012
++++ src/hb-blob.h	Sun Dec 02 11:39:40 2012
+@@ -25,7 +25,9 @@
+  */
+ 
+ #ifndef HB_H_IN
++#ifndef _MSC_VER
+ #error "Include <hb.h> instead."
++#endif
+ #endif
+ 
+ #ifndef HB_BLOB_H
+diff -u src-orig/hb-buffer.h src/hb-buffer.h
+--- src-orig/hb-buffer.h	Fri Nov 30 19:42:46 2012
++++ src/hb-buffer.h	Sun Dec 02 11:40:00 2012
+@@ -28,7 +28,9 @@
+  */
+ 
+ #ifndef HB_H_IN
++#ifndef _MSC_VER
+ #error "Include <hb.h> instead."
++#endif
+ #endif
+ 
+ #ifndef HB_BUFFER_H
+diff -u src-orig/hb-common.h src/hb-common.h
+--- src-orig/hb-common.h	Fri Nov 30 19:42:46 2012
++++ src/hb-common.h	Sun Dec 02 11:40:26 2012
+@@ -27,7 +27,9 @@
+  */
+ 
+ #ifndef HB_H_IN
++#ifndef _MSC_VER
+ #error "Include <hb.h> instead."
++#endif
+ #endif
+ 
+ #ifndef HB_COMMON_H
+diff -u src-orig/hb-font.h src/hb-font.h
+--- src-orig/hb-font.h	Fri Nov 30 19:42:46 2012
++++ src/hb-font.h	Sun Dec 02 11:40:42 2012
+@@ -25,7 +25,9 @@
+  */
+ 
+ #ifndef HB_H_IN
++#ifndef _MSC_VER
+ #error "Include <hb.h> instead."
++#endif
+ #endif
+ 
+ #ifndef HB_FONT_H
+diff -u src-orig/hb-ot-layout.h src/hb-ot-layout.h
+--- src-orig/hb-ot-layout.h	Fri Nov 30 22:29:00 2012
++++ src/hb-ot-layout.h	Sun Dec 02 11:40:58 2012
+@@ -25,7 +25,9 @@
+  */
+ 
+ #ifndef HB_OT_H_IN
++#ifndef _MSC_VER
+ #error "Include <hb-ot.h> instead."
++#endif
+ #endif
+ 
+ #ifndef HB_OT_LAYOUT_H
+diff -u src-orig/hb-ot-tag.h src/hb-ot-tag.h
+--- src-orig/hb-ot-tag.h	Fri Nov 30 19:42:46 2012
++++ src/hb-ot-tag.h	Sun Dec 02 11:41:15 2012
+@@ -25,7 +25,9 @@
+  */
+ 
+ #ifndef HB_OT_H_IN
++#ifndef _MSC_VER
+ #error "Include <hb-ot.h> instead."
++#endif
+ #endif
+ 
+ #ifndef HB_OT_TAG_H
+diff -u src-orig/hb-set.h src/hb-set.h
+--- src-orig/hb-set.h	Fri Nov 30 19:42:46 2012
++++ src/hb-set.h	Sun Dec 02 11:41:31 2012
+@@ -25,7 +25,9 @@
+  */
+ 
+ #ifndef HB_H_IN
++#ifndef _MSC_VER
+ #error "Include <hb.h> instead."
++#endif
+ #endif
+ 
+ #ifndef HB_SET_H
+diff -u src-orig/hb-shape-plan.h src/hb-shape-plan.h
+--- src-orig/hb-shape-plan.h	Fri Nov 30 19:42:46 2012
++++ src/hb-shape-plan.h	Sun Dec 02 11:41:49 2012
+@@ -25,7 +25,9 @@
+  */
+ 
+ #ifndef HB_H_IN
++#ifndef _MSC_VER
+ #error "Include <hb.h> instead."
++#endif
+ #endif
+ 
+ #ifndef HB_SHAPE_PLAN_H
+diff -u src-orig/hb-shape.h src/hb-shape.h
+--- src-orig/hb-shape.h	Fri Nov 30 19:42:46 2012
++++ src/hb-shape.h	Sun Dec 02 11:42:04 2012
+@@ -27,7 +27,9 @@
+  */
+ 
+ #ifndef HB_H_IN
++#ifndef _MSC_VER
+ #error "Include <hb.h> instead."
++#endif
+ #endif
+ 
+ #ifndef HB_SHAPE_H
+diff -u src-orig/hb-unicode.h src/hb-unicode.h
+--- src-orig/hb-unicode.h	Fri Nov 30 19:42:46 2012
++++ src/hb-unicode.h	Sun Dec 02 11:42:16 2012
+@@ -29,7 +29,9 @@
+  */
+ 
+ #ifndef HB_H_IN
++#ifndef _MSC_VER
+ #error "Include <hb.h> instead."
++#endif
+ #endif
+ 
+ #ifndef HB_UNICODE_H
+diff -u src-orig/hb-version.h.in src/hb-version.h.in
+--- src-orig/hb-version.h.in	Fri Nov 30 19:42:46 2012
++++ src/hb-version.h.in	Sun Dec 02 11:42:40 2012
+@@ -25,7 +25,9 @@
+  */
+ 
+ #ifndef HB_H_IN
++#ifndef _MSC_VER
+ #error "Include <hb.h> instead."
++#endif
+ #endif
+ 
+ #ifndef HB_VERSION_H
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-blob.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-blob.h
index 1a93baa46dc..4cbc5636686 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-blob.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-blob.h
@@ -25,8 +25,10 @@
  */
 
 #ifndef HB_H_IN
+#ifndef _MSC_VER
 #error "Include <hb.h> instead."
 #endif
+#endif
 
 #ifndef HB_BLOB_H
 #define HB_BLOB_H
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-buffer.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-buffer.h
index 48ec4a527ad..18643e348ec 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-buffer.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-buffer.h
@@ -28,8 +28,10 @@
  */
 
 #ifndef HB_H_IN
+#ifndef _MSC_VER
 #error "Include <hb.h> instead."
 #endif
+#endif
 
 #ifndef HB_BUFFER_H
 #define HB_BUFFER_H
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-common.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-common.h
index cc221d33be9..4d2e3dd0175 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-common.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-common.h
@@ -27,8 +27,10 @@
  */
 
 #ifndef HB_H_IN
+#ifndef _MSC_VER
 #error "Include <hb.h> instead."
 #endif
+#endif
 
 #ifndef HB_COMMON_H
 #define HB_COMMON_H
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-font.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-font.h
index 88d489551e8..63702b16ca5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-font.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-font.h
@@ -25,8 +25,10 @@
  */
 
 #ifndef HB_H_IN
+#ifndef _MSC_VER
 #error "Include <hb.h> instead."
 #endif
+#endif
 
 #ifndef HB_FONT_H
 #define HB_FONT_H
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-ot-layout.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-ot-layout.h
index 023f0718fc8..fc8eba94b12 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-ot-layout.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-ot-layout.h
@@ -25,8 +25,10 @@
  */
 
 #ifndef HB_OT_H_IN
+#ifndef _MSC_VER
 #error "Include <hb-ot.h> instead."
 #endif
+#endif
 
 #ifndef HB_OT_LAYOUT_H
 #define HB_OT_LAYOUT_H
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-ot-tag.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-ot-tag.h
index 1bf12ab3c09..35a22147891 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-ot-tag.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-ot-tag.h
@@ -25,8 +25,10 @@
  */
 
 #ifndef HB_OT_H_IN
+#ifndef _MSC_VER
 #error "Include <hb-ot.h> instead."
 #endif
+#endif
 
 #ifndef HB_OT_TAG_H
 #define HB_OT_TAG_H
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-set.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-set.h
index ec3d119e1e3..8bf484de2b9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-set.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-set.h
@@ -25,8 +25,10 @@
  */
 
 #ifndef HB_H_IN
+#ifndef _MSC_VER
 #error "Include <hb.h> instead."
 #endif
+#endif
 
 #ifndef HB_SET_H
 #define HB_SET_H
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-shape-plan.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-shape-plan.h
index 8f54552f90b..b73369a06e9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-shape-plan.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-shape-plan.h
@@ -25,8 +25,10 @@
  */
 
 #ifndef HB_H_IN
+#ifndef _MSC_VER
 #error "Include <hb.h> instead."
 #endif
+#endif
 
 #ifndef HB_SHAPE_PLAN_H
 #define HB_SHAPE_PLAN_H
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-shape.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-shape.h
index 90a188d2a9c..02d7c1b6178 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-shape.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-shape.h
@@ -27,8 +27,10 @@
  */
 
 #ifndef HB_H_IN
+#ifndef _MSC_VER
 #error "Include <hb.h> instead."
 #endif
+#endif
 
 #ifndef HB_SHAPE_H
 #define HB_SHAPE_H
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-unicode.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-unicode.h
index 2e10d98a3b3..4364da5c636 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-unicode.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-unicode.h
@@ -29,8 +29,10 @@
  */
 
 #ifndef HB_H_IN
+#ifndef _MSC_VER
 #error "Include <hb.h> instead."
 #endif
+#endif
 
 #ifndef HB_UNICODE_H
 #define HB_UNICODE_H
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-version.h.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-version.h.in
index 43634f91ce8..6d4aa39b13b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-version.h.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.7/src/hb-version.h.in
@@ -25,8 +25,10 @@
  */
 
 #ifndef HB_H_IN
+#ifndef _MSC_VER
 #error "Include <hb.h> instead."
 #endif
+#endif
 
 #ifndef HB_VERSION_H
 #define HB_VERSION_H