summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/cpascal.h
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-10 10:27:09 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-10 10:27:09 +0000
commit5e8e9500102800e68c9e7fcac9e85c1668b71a36 (patch)
tree81d79ac70ffbb127e8063f18c8f55475ca169ee1 /Build/source/texk/web2c/cpascal.h
parente6a9c88ada2f11dd61e4c4e39dff84944bed5787 (diff)
towards TL2010: texk/web2c
git-svn-id: svn://tug.org/texlive/trunk@15964 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/cpascal.h')
-rw-r--r--Build/source/texk/web2c/cpascal.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/cpascal.h b/Build/source/texk/web2c/cpascal.h
index 4cc13e4e434..57afa1f4083 100644
--- a/Build/source/texk/web2c/cpascal.h
+++ b/Build/source/texk/web2c/cpascal.h
@@ -57,8 +57,8 @@
#define floorunscaled(i) ((i)>>16)
#define floorscaled(i) ((i)&(-65536))
-#define roundunscaled(i) (((i>>15)+1)>>1)
-#define roundfraction(i) (((i>>11)+1)>>1)
+#define roundunscaled(i) ((((i)>>15)+1)>>1)
+#define roundfraction(i) ((((i)>>11)+1)>>1)
#ifndef TeX
/* In TeX, the half routine is always applied to positive integers.
In MF and MP, it isn't; therefore, we can't portably use the C shift
@@ -180,6 +180,11 @@ typedef unsigned char *pointertobyte;
#define constcstring const_string
+/* For strings of unsigned chars, used as array indices. */
+#define constw2custring const_w2custring
+typedef unsigned char *w2custring;
+typedef const unsigned char *const_w2custring;
+
/* Not all C libraries have fabs, so we'll roll our own. */
#undef fabs
#define fabs(x) ((x) >= 0.0 ? (x) : -(x))
@@ -225,11 +230,12 @@ typedef unsigned char *pointertobyte;
#define kpsefindfile kpse_find_file
#define kpsefindmf kpse_find_mf
#define kpsefindmft kpse_find_mft
-#define kpsefindofm kpse_find_ofm
-#define kpsefindovf kpse_find_ovf
+#define kpsefindofm kpse_find_ofm
+#define kpsefindovf kpse_find_ovf
#define kpsefindtex kpse_find_tex
#define kpsefindtfm kpse_find_tfm
#define kpsefindvf kpse_find_vf
+#define kpseinnameok kpse_in_name_ok
#define kpseinitprog kpse_init_prog
#define kpsesetprogname kpse_set_progname
#define kpsesetprogramname kpse_set_program_name
@@ -244,6 +250,7 @@ typedef unsigned char *pointertobyte;
#define kpseofmformat kpse_ofm_format
#define kpseoplformat kpse_opl_format
#define kpseotpformat kpse_otp_format
+#define kpseoutnameok kpse_out_name_ok
#define kpseovpformat kpse_ovp_format
#define kpseovfformat kpse_ovf_format
#define kpseopenfile kpse_open_file