summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/mfluadir/otfcc/include
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/mfluadir/otfcc/include')
-rw-r--r--Build/source/texk/web2c/mfluadir/otfcc/include/caryll/element.h18
-rw-r--r--Build/source/texk/web2c/mfluadir/otfcc/include/caryll/vector.h2
-rw-r--r--Build/source/texk/web2c/mfluadir/otfcc/include/dep/sds.h8
3 files changed, 17 insertions, 11 deletions
diff --git a/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/element.h b/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/element.h
index 82bfc73cfb6..b2f6c134e74 100644
--- a/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/element.h
+++ b/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/element.h
@@ -15,16 +15,16 @@
void (*move)(MODIFY T *, T *); \
void (*dispose)(MOVE T *); \
void (*replace)(MODIFY T *, MOVE const T); \
- void (*copyReplace)(MODIFY T *, const T);
+ void (*copyReplace)(MODIFY T *, const T)
#define caryll_VT(T) \
caryll_T(T); \
T (*empty)(); \
- T (*dup)(const T);
+ T (*dup)(const T)
#define caryll_RT(T) \
caryll_T(T); \
T *(*create)(); \
- void (*free)(MOVE T *);
+ void (*free)(MOVE T *)
#define caryll_ElementInterfaceOf(T) const struct __caryll_elementinterface_##T
#define caryll_ElementInterface(T) \
@@ -42,26 +42,26 @@
/// Individual traits
-#define caryll_Show(T) void (*show)(const T);
-#define caryll_Eq(T) bool (*equal)(const T, const T);
+#define caryll_Show(T) void (*show)(const T)
+#define caryll_Eq(T) bool (*equal)(const T, const T)
#define caryll_Ord(T) \
caryll_Eq(T); \
int (*compare)(const T a, const T b); \
- int (*compareRef)(const T *a, const T *b);
+ int (*compareRef)(const T *a, const T *b)
#define caryll_Monoid(T) \
T (*neutral)(); \
T (*plus)(const T a, const T b); \
- void (*inplacePlus)(MODIFY T * a, const T b);
+ void (*inplacePlus)(MODIFY T * a, const T b)
#define caryll_Group(T) \
caryll_Monoid(T); \
void (*inplaceNegate)(MODIFY T * a); \
T (*negate)(const T); \
void (*inplaceMinus)(MODIFY T *, const T); \
- T (*minus)(const T, const T);
+ T (*minus)(const T, const T)
#define caryll_Module(T, TScale) \
caryll_Group(T); \
void (*inplaceScale)(MODIFY T * a, TScale b); \
void (*inplacePlusScale)(MODIFY T * a, TScale b, const T c); \
- T (*scale)(const T a, TScale b);
+ T (*scale)(const T a, TScale b)
#endif
diff --git a/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/vector.h b/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/vector.h
index 4f1aece956c..9e5ff356831 100644
--- a/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/vector.h
+++ b/Build/source/texk/web2c/mfluadir/otfcc/include/caryll/vector.h
@@ -28,7 +28,7 @@
__T (*pop)(MODIFY __TV * arr); \
void (*disposeItem)(MODIFY __TV * arr, size_t n); \
void (*filterEnv)(MODIFY __TV * arr, bool (*fn)(const __T *x, void *env), void *env); \
- void (*sort)(MODIFY __TV * arr, int (*fn)(const __T *a, const __T *b));
+ void (*sort)(MODIFY __TV * arr, int (*fn)(const __T *a, const __T *b))
#define caryll_VectorInterface(__TV, __T) \
caryll_VectorInterfaceTypeName(__TV) { \
diff --git a/Build/source/texk/web2c/mfluadir/otfcc/include/dep/sds.h b/Build/source/texk/web2c/mfluadir/otfcc/include/dep/sds.h
index 3cdc7e98548..36267c3c84d 100644
--- a/Build/source/texk/web2c/mfluadir/otfcc/include/dep/sds.h
+++ b/Build/source/texk/web2c/mfluadir/otfcc/include/dep/sds.h
@@ -42,6 +42,10 @@ typedef char *sds;
/* Note: sdshdr5 is never used, we just access the flags byte directly.
* However is here to document the layout of type 5 SDS strings. */
+#ifdef _MSC_VER
+#define __attribute__(x)
+#pragma pack(push,1)
+#endif
struct __attribute__((__packed__)) sdshdr5 {
unsigned char flags; /* 3 lsb of type, and 5 msb of string length */
char buf[];
@@ -70,7 +74,9 @@ struct __attribute__((__packed__)) sdshdr64 {
unsigned char flags; /* 3 lsb of type, 5 unused bits */
char buf[];
};
-
+#ifdef _MSC_VER
+#pragma pack(pop)
+#endif
#define SDS_TYPE_5 0
#define SDS_TYPE_8 1
#define SDS_TYPE_16 2