 config/cf/hp.cf                                                 |    7 +++++
 config/cf/hpLib.rules                                           |    2 +
 config/imake/imakemdep.h                                        |   13 ++++++++++
 config/makedepend/main.c                                        |    2 -
 include/Xos.h                                                   |    7 ++++-
 programs/Xserver/XIE/mixie/import/mijpeg.c                      |    2 -
 programs/Xserver/XIE/mixie/process/mpgeomaa.c                   |    2 -
 programs/Xserver/XIE/mixie/process/mpgeomnn.c                   |    2 -
 programs/Xserver/hw/hp/input/drivers/hil_driver.c               |    2 -
 programs/Xserver/hw/hp/input/hpKeyMap.c                         |    2 -
 programs/Xserver/hw/xfree86/accel/i128/i128scrin.c              |    2 -
 programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c            |    2 -
 programs/Xserver/hw/xfree86/mono/drivers/apollo/apolloHW.h      |    2 -
 programs/Xserver/hw/xfree86/mono/drivers/apollo/apollodriv.c    |    6 ++--
 programs/Xserver/hw/xfree86/mono/drivers/hgc1280/hgc1280driv.c  |    4 +--
 programs/Xserver/hw/xfree86/mono/drivers/sigma/sigmadriv.c      |    4 +--
 programs/Xserver/hw/xfree86/mono/mono/mono.c                    |    6 ++--
 programs/Xserver/hw/xfree86/mono/mono/mono.h                    |    4 +--
 programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c               |    2 -
 programs/Xserver/hw/xfree86/vga256/drivers/ati/regati.h         |    2 -
 programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c |    2 -
 programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_cursor.c  |    2 -
 programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c     |    2 -
 test/xsuite/xtest/src/bin/mc/files.c                            |    2 -
 util/patch/malloc.c                                             |   12 +++------
 util/patch/pch.c                                                |    2 -
 config/cf/Imake.cf                                              |    7 +++++
 27 files changed, 68 insertions(+), 36 deletions(-)
