xli/c_includes.diff

   1 diff -Naur xli-2006-11-10_old//clip.c xli-2006-11-10_new//clip.c
   2 --- xli-2006-11-10_old//clip.c  1999-10-25 04:14:52.000000000 +0200
   3 +++ xli-2006-11-10_new//clip.c  2011-06-14 22:33:37.000000000 +0200
   4 @@ -8,6 +8,7 @@
   5   * See included file "copyright.h" for complete copyright information.
   6   */
   7
   8 +#include <string.h>
   9  #include "copyright.h"
  10  #include "xli.h"
  11
  12 diff -Naur xli-2006-11-10_old//dither.c xli-2006-11-10_new//dither.c
  13 --- xli-2006-11-10_old//dither.c        1999-10-25 04:14:54.000000000 +0200
  14 +++ xli-2006-11-10_new//dither.c        2011-06-14 22:34:00.000000000 +0200
  15 @@ -22,6 +22,7 @@
  16   * See included file "copyright.h" for complete copyright information.
  17   */
  18
  19 +#include <string.h>
  20  #include "copyright.h"
  21  #include "kljcpyrght.h"
  22  #include "xli.h"
  23 diff -Naur xli-2006-11-10_old//faces.c xli-2006-11-10_new//faces.c
  24 --- xli-2006-11-10_old//faces.c 2006-11-11 06:52:14.000000000 +0100
  25 +++ xli-2006-11-10_new//faces.c 2011-06-14 22:52:38.000000000 +0200
  26 @@ -8,10 +8,10 @@
  27   * See included file "copyright.h" for complete copyright information.
  28   */
  29
  30 +#include <string.h>
  31  #include "copyright.h"
  32  #include "xli.h"
  33  #include "imagetypes.h"
  34 -#include <string.h>
  35
  36  /* read a hex value and return its value
  37   */
  38 diff -Naur xli-2006-11-10_old//fbm.c xli-2006-11-10_new//fbm.c
  39 --- xli-2006-11-10_old//fbm.c   2006-11-11 06:52:14.000000000 +0100
  40 +++ xli-2006-11-10_new//fbm.c   2011-06-14 22:54:08.000000000 +0200
  41 @@ -14,9 +14,10 @@
  42   * Copyright 1990 Mark Majhor (see the included file
  43   * "mrmcpyrght.h" for complete copyright information)
  44   */
  45 +# include <string.h>
  46  # include "xli.h"
  47  # include <ctype.h>
  48 -# include <string.h>
  49 +
  50  #define FBM_C
  51  # include "fbm.h"
  52  # include "imagetypes.h"
  53 diff -Naur xli-2006-11-10_old//Imakefile xli-2006-11-10_new//Imakefile
  54 --- xli-2006-11-10_old//Imakefile       2006-11-11 06:52:14.000000000 +0100
  55 +++ xli-2006-11-10_new//Imakefile       2011-06-14 23:07:58.000000000 +0200
  56 @@ -36,21 +36,7 @@
  57  ComplexProgramTarget_1(xli,$(DEFINES) $(LOCAL_LIBRARIES),)
  58  ComplexProgramTarget_2(xlito,,)
  59
  60 -install:: $(SYSPATHFILE)
  61 +install::
  62         $(RM) $(BINDIR)/xview $(BINDIR)/xsetbg
  63         $(LN) $(BINDIR)/xli $(BINDIR)/xview
  64         $(LN) $(BINDIR)/xli $(BINDIR)/xsetbg
  65 -
  66 -$(SYSPATHFILE):
  67 -       @echo "*** Creating default $(SYSPATHFILE) since you"
  68 -       @echo "*** don't have one. This file is used to set up default places"
  69 -       @echo "*** and names to look for images.  You probably want to edit"
  70 -       @echo "*** it for your site.  See the xloadimage manual page for"
  71 -       @echo "*** details on the contents of this file."
  72 -       cp /dev/null $(SYSPATHFILE)
  73 -       echo "path=$(INCDIR)/bitmaps $(INCDIR)/images" \
  74 -               >> $(SYSPATHFILE)
  75 -       echo "extension=.gif .jpg .rle .csun .msun .sun .face .xbm .bm" \
  76 -               >>$(SYSPATHFILE)
  77 -       chmod a+r $(SYSPATHFILE)
  78 -
  79 diff -Naur xli-2006-11-10_old//misc.c xli-2006-11-10_new//misc.c
  80 --- xli-2006-11-10_old//misc.c  2006-11-11 06:52:14.000000000 +0100
  81 +++ xli-2006-11-10_new//misc.c  2011-06-14 22:54:57.000000000 +0200
  82 @@ -8,11 +8,11 @@
  83   * See included file "copyright.h" for complete copyright information.
  84   */
  85
  86 +#include <string.h>
  87  #include "copyright.h"
  88  #include "xli.h"
  89  #include "patchlevel"
  90  #include <signal.h>
  91 -#include <string.h>
  92
  93  static char *signalName(int sig)
  94  {
  95 diff -Naur xli-2006-11-10_old//options.c xli-2006-11-10_new//options.c
  96 --- xli-2006-11-10_old//options.c       2006-11-11 06:52:14.000000000 +0100
  97 +++ xli-2006-11-10_new//options.c       2011-06-14 22:56:10.000000000 +0200
  98 @@ -8,9 +8,9 @@
  99   * See included file "copyright.h" for complete copyright information.
 100   */
 101
 102 +#include <string.h>
 103  #include "copyright.h"
 104  #include "xli.h"
 105 -#include <string.h>
 106  #include <stdlib.h>
 107
 108  /* options array and definitions.  If you add something to this you also
 109 diff -Naur xli-2006-11-10_old//path.c xli-2006-11-10_new//path.c
 110 --- xli-2006-11-10_old//path.c  2006-11-11 06:52:14.000000000 +0100
 111 +++ xli-2006-11-10_new//path.c  2011-06-14 22:57:08.000000000 +0200
 112 @@ -8,6 +8,7 @@
 113   * See included file "copyright.h" for complete copyright information.
 114   */
 115
 116 +#include <string.h>
 117  #include "copyright.h"
 118  #include "xli.h"
 119  #include <sys/stat.h>
 120 @@ -17,7 +18,6 @@
 121  #include <pwd.h>
 122  #endif
 123  #include <errno.h>
 124 -#include <string.h>
 125
 126  extern int errno;
 127
 128 diff -Naur xli-2006-11-10_old//png.c xli-2006-11-10_new//png.c
 129 --- xli-2006-11-10_old//png.c   2006-11-11 06:52:14.000000000 +0100
 130 +++ xli-2006-11-10_new//png.c   2011-06-14 23:02:44.000000000 +0200
 131 @@ -3,10 +3,10 @@
 132   * Glenn Randers-Pehrson et al.  Any bugs are my fault. -- smar@reptiles.org
 133   */
 134
 135 +#include <png.h>
 136  #include "xli.h"
 137  #include "imagetypes.h"
 138  #include "pbm.h"
 139 -#include <png.h>
 140  #include <assert.h>
 141
 142  #define TITLE_KEYWORD "Title"
 143 diff -Naur xli-2006-11-10_old//root.c xli-2006-11-10_new//root.c
 144 --- xli-2006-11-10_old//root.c  2006-11-11 06:52:14.000000000 +0100
 145 +++ xli-2006-11-10_new//root.c  2011-06-14 22:58:13.000000000 +0200
 146 @@ -10,9 +10,9 @@
 147   * See included file "copyright.h" for complete copyright information.
 148   */
 149
 150 +#include <string.h>
 151  #include "copyright.h"
 152  #include "xli.h"
 153 -#include <string.h>
 154
 155  #define RETAIN_PROP_NAME       "_XSETROOT_ID"
 156
 157 diff -Naur xli-2006-11-10_old//window.c xli-2006-11-10_new//window.c
 158 --- xli-2006-11-10_old//window.c        2006-11-11 06:52:14.000000000 +0100
 159 +++ xli-2006-11-10_new//window.c        2011-06-14 22:58:54.000000000 +0200
 160 @@ -9,10 +9,10 @@
 161   * See included file "copyright.h" for complete copyright information.
 162   */
 163
 164 +#include <string.h>
 165  #include "copyright.h"
 166  #include "xli.h"
 167  #include <ctype.h>
 168 -#include <string.h>
 169  #include <signal.h>
 170  #include <errno.h>
 171  #include <sys/types.h>
 172 diff -Naur xli-2006-11-10_old//xlito.c xli-2006-11-10_new//xlito.c
 173 --- xli-2006-11-10_old//xlito.c 2006-11-11 06:52:14.000000000 +0100
 174 +++ xli-2006-11-10_new//xlito.c 2011-06-14 23:03:49.000000000 +0200
 175 @@ -1,3 +1,4 @@
 176 +#include <string.h>
 177  #include <fcntl.h>
 178  #include <stdio.h>
 179  #include <stdlib.h>
 180 @@ -8,7 +9,6 @@
 181  #ifndef VMS
 182  #include <unistd.h>
 183  #endif
 184 -#include <string.h>
 185
 186  #define VERSION "1"
 187  #define PATCHLEVEL "02"
 188 diff -Naur xli-2006-11-10_old//xpixmap.c xli-2006-11-10_new//xpixmap.c
 189 --- xli-2006-11-10_old//xpixmap.c       2006-11-11 06:52:14.000000000 +0100
 190 +++ xli-2006-11-10_new//xpixmap.c       2011-06-14 22:59:53.000000000 +0200
 191 @@ -15,11 +15,10 @@
 192   *
 193   * Modified 16/10/92 by GWG to add version 2C and 3 support.
 194   */
 195 -
 196 +#include <string.h>
 197  #include "copyright.h"
 198  #include "xli.h"
 199  #include "imagetypes.h"
 200 -#include <string.h>
 201
 202  static void freeCtable(char **ctable, int ncolors)
 203                 /* color table */
 204 diff -Naur xli-2006-11-10_old//zio.c xli-2006-11-10_new//zio.c
 205 --- xli-2006-11-10_old//zio.c   2006-11-11 06:52:14.000000000 +0100
 206 +++ xli-2006-11-10_new//zio.c   2011-06-14 23:01:31.000000000 +0200
 207 @@ -18,10 +18,10 @@
 208   *
 209   */
 210
 211 +#include <string.h>
 212 +#include <ctype.h>
 213  #include "copyright.h"
 214  #include "xli.h"
 215 -#include <ctype.h>
 216 -#include <string.h>
 217
 218  #ifdef VMS
 219  #define NO_UNCOMPRESS          /* VMS doesn't have uncompress */