xc/programs/xpr/x2jet.csco_port_update-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1

//freedesktop.org/bugzilla/show_bug.cgi?id=1795): Fix build bustage caused
    by bug 1779, patch by Bernhard Rosenkraenzer <bero@arklinux.org>.

2 files changed, 20 insertions, 21 deletions

diff --git a/x2jet.c b/x2jet.c
index ec0728e..26a60ec 100644
--- a/x2jet.c
+++ b/x2jet.c
@@ -138,7 +138,7 @@ typedef struct {
 
 /* Local prototypes */
 static void set_image_limits (  int scale, int density,  enum orientation orient,  Area print_area);
-static void set_header_trailer_limits (const char *header, const char *trailer, long printwidth);
+static void set_header_trailer_limits (char *header, char *trailer, long printwidth);
 static void set_print_locations (  int scale, int density,  int top, int left,  const char *header, const char *trailer,  enum orientation orient,  int position_on_page);
 static int scale_raster (
   int density,
@@ -299,7 +299,7 @@ void set_image_limits (
 
 
 static
-void set_header_trailer_limits (const char *header, const char *trailer, long printwidth)
+void set_header_trailer_limits (char *header, char *trailer, long printwidth)
 {
   /* Determine the number of header and trailer characters
    * that will fit into the available printing area.
diff --git a/xpr.c b/xpr.c
index 5940b51..42ec785 100644
--- a/xpr.c
+++ b/xpr.c
@@ -153,6 +153,22 @@ GrayRec gray2x2 = {sizeof(grayscale2x2)/sizeof(long), 2, 2, grayscale2x2};
 GrayRec gray3x3 = {sizeof(grayscale3x3)/sizeof(long), 3, 3, grayscale3x3};
 GrayRec gray4x4 = {sizeof(grayscale4x4)/sizeof(long), 4, 4, grayscale4x4};
 
+/* mapping tables to map a byte in to the hex representation of its
+ * bit-reversal
+ */
+const
+char hex1[]="084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f\
+084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f\
+084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f\
+084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f";
+
+const
+char hex2[]="000000000000000088888888888888884444444444444444cccccccccccccccc\
+2222222222222222aaaaaaaaaaaaaaaa6666666666666666eeeeeeeeeeeeeeee\
+111111111111111199999999999999995555555555555555dddddddddddddddd\
+3333333333333333bbbbbbbbbbbbbbbb7777777777777777ffffffffffffffff";
+
+
 /* Local prototypes */
 static void usage(void);
 static
@@ -208,7 +224,7 @@ void build_sixmap(
   int hpad,
   XWDFileHeader *win,
   const char *data);
-static void build_output_filename(const char *name, enum device device, const char *oname);
+static void build_output_filename(const char *name, enum device device, char *oname);
 static
 void ln03_setup(
   int iw,
@@ -1116,7 +1132,7 @@ void build_sixmap(
 }
 
 static
-void build_output_filename(const char *name, enum device device, const char *oname)
+void build_output_filename(const char *name, enum device device, char *oname)
 {
     while (*name && *name != '.') *oname++ = *name++;
     switch (device) {
@@ -1911,7 +1927,6 @@ int ps_putbuf(
   int compact)			/* if non-zero, do compaction (see below) */
 {
     register int ffcount = 0;
-    extern char hex1[],hex2[];
     static char hex[] = "0123456789abcdef";
 #define PUT(c) { putchar(c); if (++ocount>=LINELEN) \
 	{ putchar('\n'); ocount=0; }}
@@ -2038,19 +2053,3 @@ void fullread (
 	data += bytes_read;
 	}
 }
-
-/* mapping tables to map a byte in to the hex representation of its
- * bit-reversal
- */
-const
-char hex1[]="084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f\
-084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f\
-084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f\
-084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f084c2a6e195d3b7f";
-
-const
-char hex2[]="000000000000000088888888888888884444444444444444cccccccccccccccc\
-2222222222222222aaaaaaaaaaaaaaaa6666666666666666eeeeeeeeeeeeeeee\
-111111111111111199999999999999995555555555555555dddddddddddddddd\
-3333333333333333bbbbbbbbbbbbbbbb7777777777777777ffffffffffffffff";
-