4 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/texk/ps2pk/ChangeLog b/Build/source/texk/ps2pk/ChangeLog
index c6f27e98105..ff5681746af 100644
--- a/Build/source/texk/ps2pk/ChangeLog
+++ b/Build/source/texk/ps2pk/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-31  Luigi Scarso  <uigi.scarso@gmail.com>
+
+	* pk2bm.c, pkin.c, pkin.h: Support charext.
+
 2015-07-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Better dependencies for 'make check'.
diff --git a/Build/source/texk/ps2pk/pk2bm.c b/Build/source/texk/ps2pk/pk2bm.c
index 9e620581f0e..3d241352232 100644
--- a/Build/source/texk/ps2pk/pk2bm.c
+++ b/Build/source/texk/ps2pk/pk2bm.c
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
 
    pkname = argv[0];
 
-   if (readchar(pkname, (shalfword)C, &cd)) {
+   if (readchar(pkname, (integer)C, &cd)) {
       int H, dh, W, dw, bitsleft;
       halfword nextword; quarterword nextbyte;
 
@@ -221,5 +221,5 @@ atoo(char *oct)
 {
    int octal = 0;
    while (*oct != '\0') octal = 8*octal + (*oct++) - '0';
-   return octal & 0xff;
+   return octal;
 }
diff --git a/Build/source/texk/ps2pk/pkin.c b/Build/source/texk/ps2pk/pkin.c
index cc4e2145519..5632b393441 100644
--- a/Build/source/texk/ps2pk/pkin.c
+++ b/Build/source/texk/ps2pk/pkin.c
@@ -335,7 +335,7 @@ unpack(chardesc *cd)
  *   return FALSE (0) otherwise.
  */
 int
-readchar(char *name, shalfword c, chardesc *cd)
+readchar(char *name, integer c, chardesc *cd)
 {
    register shalfword i ;
    register integer k ;
diff --git a/Build/source/texk/ps2pk/pkin.h b/Build/source/texk/ps2pk/pkin.h
index ce5db039554..a646c24bea8 100644
--- a/Build/source/texk/ps2pk/pkin.h
+++ b/Build/source/texk/ps2pk/pkin.h
@@ -58,4 +58,4 @@ typedef struct {
    halfword *raster ;
 } chardesc ;
 
-int readchar(char *name, shalfword c, chardesc *cd);
+int readchar(char *name, integer c, chardesc *cd);