bug 527276 - part 1a - patches to OTS source to resolve build issues. r=roc a=blocking2.0

gfx/ots/include/opentype-sanitiser.h

@@ -15,6 +15,8 @@ typedef unsigned int uint32_t;
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 #include <Winsock2.h>  // for htons/ntohs
+#undef min
+#undef max
 #else
 #include <arpa/inet.h>
 #include <stdint.h>

gfx/ots/src/cff.cc

@@ -19,12 +19,12 @@ namespace {
 enum DICT_OPERAND_TYPE {
   DICT_OPERAND_INTEGER,
   DICT_OPERAND_REAL,
-  DICT_OPERATOR,
+  DICT_OPERATOR
 };
 
 enum DICT_DATA_TYPE {
   DICT_DATA_TOPLEVEL,
-  DICT_DATA_FDARRAY,
+  DICT_DATA_FDARRAY
 };
 
 // see Appendix. A

gfx/ots/src/cff_type2_charstring.h

@@ -90,7 +90,7 @@ enum Type2CharStringOperator {
   kHFlex = (12 << 8) + 34,
   kFlex = (12 << 8) + 35,
   kHFlex1 = (12 << 8) + 36,
-  kFlex1 = (12 << 8) + 37,
+  kFlex1 = (12 << 8) + 37
   // Operators that are obsoleted or undocumented, such as 'blend', will be
   // rejected.
 };