remove net-print/omni

9 files changed, 0 insertions, 1958 deletions

diff --git a/net-print/omni/ChangeLog b/net-print/omni/ChangeLog
deleted file mode 100644
index fda4f263e9c2..000000000000
--- a/net-print/omni/ChangeLog
+++ /dev/null
@@ -1,59 +0,0 @@
-# ChangeLog for net-print/omni
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/omni/ChangeLog,v 1.16 2008/11/23 19:25:07 halcy0n Exp $
-
-  23 Nov 2008; Mark Loeser <halcy0n@gentoo.org>
-  +files/Omni-0.9.2-gcc43.patch, +files/OmniEpsonVendor-0.9.2-gcc43.patch,
-  omni-0.9.2.ebuild:
-  Patches to fix compilation with gcc-4.3, thanks to Mario Fetka <mario DOT
-  fetka AT gmail DOT com>; bug #236460
-
-  16 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-  11 Jul 2008; Rémi Cardona <remi@gentoo.org> omni-0.9.1.ebuild,
-  omni-0.9.2.ebuild:
-  use only one gtkmm and libsigc++ slot (see bugs #228463 and #228485)
-
-  07 Apr 2007; Christian Faulhammer <opfer@gentoo.org> omni-0.9.2.ebuild:
-  stable x86, bug 160047
-
-  07 Apr 2007; Stefan Schweizer <genstef@gentoo.org> omni-0.9.2.ebuild:
-  Fix broken autotools handling thanks jakub, bug 160047
-
-  07 Apr 2007; Stefan Schweizer <genstef@gentoo.org> omni-0.9.1.ebuild,
-  omni-0.9.2.ebuild:
-  depends on =dev-libs/glib-1* thanks to CFuga <cfuga@itam.mx> in bug 170200
-
-  09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
-  Regenerate digest in Manifest2 format.
-
-  08 Jun 2005; David Holm <dholm@gentoo.org> omni-0.9.2.ebuild:
-  Added to ~ppc.
-
-*omni-0.9.2 (07 Jun 2005)
-
-  07 Jun 2005; Heinrich Wendel <lanius@gentoo.org> -omni-0.9.0.ebuild,
-  omni-0.9.1.ebuild, +omni-0.9.2.ebuild:
-  version bump
-
-  11 Jul 2004; Heinrich Wendel <lanius@gentoo.org> :
-  version bump, bug #52170
-
-  14 Jun 2004; Aron Griffis <agriffis@gentoo.org> omni-0.9.0.ebuild:
-  Fix use invocation, make use of use_enable, clean up ebuild
-
-  02 Mar 2004; Heinrich Wendel <lanius@gentoo.org> omni-0.9.0.ebuild:
-  sed -i
-
-  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> omni-0.9.0.ebuild:
-  changed app-text/ghostscript to virtual/ghostscript
-
-  21 Jul 2003; lanius@gentoo.org omni-0.9.0.ebuild:
-  fixed ppds useflag
-
-*omni-0.9.0 (16 Jul 2003)
-
-  16 Jul 2003; Heinrich Wendel <lanius@gentoo.org> omni-0.9.0.ebuild:
-  initial release, thx to SpanKY <vapier@gentoo.org>  (bug #6658)
-
diff --git a/net-print/omni/Manifest b/net-print/omni/Manifest
deleted file mode 100644
index 82d5d652a0d8..000000000000
--- a/net-print/omni/Manifest
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX Omni-0.9.2-gcc43.patch 59593 RMD160 685a0b149db51341c548fb238925bbe309a5d175 SHA1 f1271312c0ff7e0df137a6ab500134d1e18078bd SHA256 fe200663cb1b8d1b933ac82dc9b9ef541166188a6acad8081382c060334bc108
-AUX OmniEpsonVendor-0.9.2-gcc43.patch 829 RMD160 6400dcb32ac39dad7826f096f7c3dc6798ab1f3d SHA1 6e9d727ffadfa93d253757e569c44b5724f18a27 SHA256 135fcab7bab07743b7db45485f7653813eb75fe394011e15a16bdb32651124cb
-AUX omni-0.9.1-cxx.patch 436 RMD160 9bd7825485c283adcb0d70c2fff34c8fdf412ab0 SHA1 706790edd39659cabb2a12955d71c4190aee5500 SHA256 36c15ee157e0a1b7968cfb7a578628f8fbd836906fd5d29c9fe4553fe00ee453
-AUX omni-0.9.1-errno.patch 454 RMD160 ef94386d8ecfc25fda2450d8924189c7591affd4 SHA1 d425af04bb319f9440c0d7d652389258e268a74e SHA256 5d893350c01b075915988488e74a7de08ae9f59ac9887204d206e67924e12b27
-DIST Omni-0.9.1.tar.gz 4354960 RMD160 df9c7d7fb5290593441981e7e45ba22bd0581746 SHA1 1bbef2b91a93b3a08577b5ad4a06d83cdf10fa98 SHA256 f22f2316c00b61f92c60e655b822b771535a08649517a6d30610e61d55f030ec
-DIST Omni-0.9.2.tar.gz 4222308 RMD160 2e9dcc4194e1df0fce2cf1659411fff9e6e7b00c SHA1 796c5bf28d66ed186a1b0d169c660d9f91c2af92 SHA256 e8f36dfea952ad7a3eebf6d8d08aafd191906ba6b8992c5f56166bc7e67532a2
-DIST OmniArchitecture.0.3.pdf 169117 RMD160 8b75b1f55cbb93d3b7ec6c29046927e136c891ce SHA1 20d982f1f5245433dc3585db2b5b1a9335df7cd2 SHA256 98a6d83586f6ca53354cc2c8f6a7739197993223d5e9d9f67b6292de12906bd0
-DIST OmniEpsonVendor-0.9.2.tar.gz 8493387 RMD160 817a78002e3b96d3f99d644237421c1e3b7fb9ba SHA1 c551c0d6f4142f0072366cfaee310148460e7e36 SHA256 63b1e30b4a4fc12f11d67ca019468e014dce0638f8845a501e2392a298692da7
-DIST omni-0.9.2-foomatic.tar.bz2 91000 RMD160 36a8dd1fdf15bcaa91a1a741d6b057dbe8431ec3 SHA1 a8e21ae0084c9860902ba98fa711c87d0435b4d1 SHA256 0d0b8613cd705db7fdb8aed95306a377537fbf443d53414889f2348131ca8199
-EBUILD omni-0.9.1.ebuild 1548 RMD160 8aff7f6d1e4fd9ebd690e6329570aa14aea9e6d8 SHA1 291be893c6ae08ae391f6fa66de403a52bbc360a SHA256 53499c5ddc0d09feb527a2a8a2d57a7447bff38cd86c9c89c6da171294c0dcd6
-EBUILD omni-0.9.2.ebuild 1930 RMD160 065f9ed0735a781b0b85c442fe9415f16996e3a5 SHA1 cffd3e583a7dd603d5ca042addf7212a80beb455 SHA256 5b714785406727874d1cbfbc100c357877491380c15acc82fc175c0abf8a7b1f
-MISC ChangeLog 2135 RMD160 ce002fc720a24b6f44faeef6ed969ecb9c14dde7 SHA1 fb286e78829f9fca9b05c99af4c200fd57e75fb2 SHA256 0ec9340ba219fdeeb1bba5ef78f65952cbab187848cc7392a0c5dd62c0845048
-MISC metadata.xml 227 RMD160 a4458a03358b3a12496abb096b4a7c2965a27966 SHA1 a019c7edb3c2c0ab7b6da67911780d768fd12a53 SHA256 cd389f9ee491cf3de38edaca4b79dc96908683a6745428b8bfeb68f2829baafd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkprhkACgkQCRZPokWLroTgpwCfe3zGx3nUuOcB46dyFVzKfI/u
-sdsAoNCWK3Ovx51KL7FxViSinefZ0AVY
-=9j6L
------END PGP SIGNATURE-----
diff --git a/net-print/omni/files/Omni-0.9.2-gcc43.patch b/net-print/omni/files/Omni-0.9.2-gcc43.patch
deleted file mode 100644
index b06da768a200..000000000000
--- a/net-print/omni/files/Omni-0.9.2-gcc43.patch
+++ /dev/null
@@ -1,1692 +0,0 @@
-Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
-Date: 2008-09-02
-Initial Package Version: 0.9.2
-Origin: me
-Upstream Status: unknown
-Description: make it compile with gcc 4.3
- 
-diff -Naur Omni-0.9.2.orig/Brother/Brother ESC Blitter.cpp Omni-0.9.2/Brother/Brother ESC Blitter.cpp
---- Omni-0.9.2.orig/Brother/Brother ESC Blitter.cpp	2004-08-30 14:53:27.000000000 +0000
-+++ Omni-0.9.2/Brother/Brother ESC Blitter.cpp	2008-09-02 13:25:54.432004654 +0000
-@@ -19,6 +19,9 @@
- #include "Brother_ESC_Blitter.hpp"
- #include "Brother_ESC_Instance.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #include <DeviceOrientation.hpp>
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
-diff -Naur Omni-0.9.2.orig/Brother/Brother ESC Instance.cpp Omni-0.9.2/Brother/Brother ESC Instance.cpp
---- Omni-0.9.2.orig/Brother/Brother ESC Instance.cpp	2004-08-26 19:47:13.000000000 +0000
-+++ Omni-0.9.2/Brother/Brother ESC Instance.cpp	2008-09-02 13:25:54.433004991 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/Brother/Brother PCL Blitter.cpp Omni-0.9.2/Brother/Brother PCL Blitter.cpp
---- Omni-0.9.2.orig/Brother/Brother PCL Blitter.cpp	2004-08-30 14:53:26.000000000 +0000
-+++ Omni-0.9.2/Brother/Brother PCL Blitter.cpp	2008-09-02 13:25:54.433004991 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/Brother/Brother PCL Instance.cpp Omni-0.9.2/Brother/Brother PCL Instance.cpp
---- Omni-0.9.2.orig/Brother/Brother PCL Instance.cpp	2004-08-26 19:47:14.000000000 +0000
-+++ Omni-0.9.2/Brother/Brother PCL Instance.cpp	2008-09-02 13:25:54.434003512 +0000
-@@ -25,6 +25,8 @@
- #include <iostream>
- #include <sstream>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- DeviceInstance *
- createInstance (PrintDevice *pDevice)
-diff -Naur Omni-0.9.2.orig/CUPS/GenerateOmniPPD.cpp Omni-0.9.2/CUPS/GenerateOmniPPD.cpp
---- Omni-0.9.2.orig/CUPS/GenerateOmniPPD.cpp	2004-06-09 15:19:49.000000000 +0000
-+++ Omni-0.9.2/CUPS/GenerateOmniPPD.cpp	2008-09-02 13:25:54.439003798 +0000
-@@ -22,6 +22,7 @@
- #include <cstdio>
- #include <cstdlib>
- #include <iomanip>
-+#include <cstring>
- 
- #include <cups/cups.h>
- #include <cups/raster.h>
-diff -Naur Omni-0.9.2.orig/CUPS/GenerateOmniPPDs.cpp Omni-0.9.2/CUPS/GenerateOmniPPDs.cpp
---- Omni-0.9.2.orig/CUPS/GenerateOmniPPDs.cpp	2004-06-09 15:18:03.000000000 +0000
-+++ Omni-0.9.2/CUPS/GenerateOmniPPDs.cpp	2008-09-02 13:25:54.439003798 +0000
-@@ -35,6 +35,9 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- void
- printUsage (char *pszProgramName)
- {
-diff -Naur Omni-0.9.2.orig/Canon/Canon BJC-8500 Blitter.cpp Omni-0.9.2/Canon/Canon BJC-8500 Blitter.cpp
---- Omni-0.9.2.orig/Canon/Canon BJC-8500 Blitter.cpp	2004-08-30 14:53:30.000000000 +0000
-+++ Omni-0.9.2/Canon/Canon BJC-8500 Blitter.cpp	2008-09-02 13:25:54.435003639 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- const static bool fTestNoCompression = false;
-diff -Naur Omni-0.9.2.orig/Canon/Canon BJC-8500 Instance.cpp Omni-0.9.2/Canon/Canon BJC-8500 Instance.cpp
---- Omni-0.9.2.orig/Canon/Canon BJC-8500 Instance.cpp	2004-08-26 19:47:14.000000000 +0000
-+++ Omni-0.9.2/Canon/Canon BJC-8500 Instance.cpp	2008-09-02 13:25:54.435003639 +0000
-@@ -21,6 +21,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/Canon/Canon Blitter.cpp Omni-0.9.2/Canon/Canon Blitter.cpp
---- Omni-0.9.2.orig/Canon/Canon Blitter.cpp	2004-08-30 14:53:28.000000000 +0000
-+++ Omni-0.9.2/Canon/Canon Blitter.cpp	2008-09-02 13:25:54.436003556 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- const static bool fTestNoCompression = false;
-diff -Naur Omni-0.9.2.orig/Canon/Canon Instance.cpp Omni-0.9.2/Canon/Canon Instance.cpp
---- Omni-0.9.2.orig/Canon/Canon Instance.cpp	2004-08-26 19:47:16.000000000 +0000
-+++ Omni-0.9.2/Canon/Canon Instance.cpp	2008-09-02 13:25:54.437003404 +0000
-@@ -21,6 +21,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/Canon/Canon S450 Blitter.cpp Omni-0.9.2/Canon/Canon S450 Blitter.cpp
---- Omni-0.9.2.orig/Canon/Canon S450 Blitter.cpp	2004-08-30 14:53:13.000000000 +0000
-+++ Omni-0.9.2/Canon/Canon S450 Blitter.cpp	2008-09-02 13:25:54.437003404 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- const static bool fTestNoCompression = false;
-diff -Naur Omni-0.9.2.orig/Canon/Canon S450 Instance.cpp Omni-0.9.2/Canon/Canon S450 Instance.cpp
---- Omni-0.9.2.orig/Canon/Canon S450 Instance.cpp	2004-08-26 19:47:00.000000000 +0000
-+++ Omni-0.9.2/Canon/Canon S450 Instance.cpp	2008-09-02 13:25:54.438003531 +0000
-@@ -21,6 +21,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/DeviceConnection.cpp Omni-0.9.2/DeviceConnection.cpp
---- Omni-0.9.2.orig/DeviceConnection.cpp	2003-11-14 18:22:14.000000000 +0000
-+++ Omni-0.9.2/DeviceConnection.cpp	2008-09-02 13:25:54.439003798 +0000
-@@ -19,6 +19,9 @@
- #include "DeviceConnection.hpp"
- #include "StringResource.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceConnection::
- DeviceConnection (Device *pDevice,
-                   int     id,
-diff -Naur Omni-0.9.2.orig/DeviceCopies.cpp Omni-0.9.2/DeviceCopies.cpp
---- Omni-0.9.2.orig/DeviceCopies.cpp	2004-08-26 19:47:29.000000000 +0000
-+++ Omni-0.9.2/DeviceCopies.cpp	2008-09-02 13:25:54.440003646 +0000
-@@ -19,6 +19,9 @@
- #include "DeviceCopies.hpp"
- #include "JobProperties.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- static PSZCRO vapszJobPropertyKeys[] = {
-    "Copies"
- };
-diff -Naur Omni-0.9.2.orig/DeviceDither.cpp Omni-0.9.2/DeviceDither.cpp
---- Omni-0.9.2.orig/DeviceDither.cpp	2003-11-24 22:05:36.000000000 +0000
-+++ Omni-0.9.2/DeviceDither.cpp	2008-09-02 13:25:54.440003646 +0000
-@@ -20,6 +20,7 @@
- #include "PrintDevice.hpp"
- #include "JobProperties.hpp"
- 
-+#include <cstring>
- #include <cstdio>
- #include <cstdlib>
- #include <fstream>
-diff -Naur Omni-0.9.2.orig/DeviceForm.cpp Omni-0.9.2/DeviceForm.cpp
---- Omni-0.9.2.orig/DeviceForm.cpp	2004-06-09 15:18:03.000000000 +0000
-+++ Omni-0.9.2/DeviceForm.cpp	2008-09-02 13:25:54.441003912 +0000
-@@ -22,6 +22,7 @@
- #include "JobProperties.hpp"
- 
- #include <cstdio>
-+#include <cstdlib>
- #include <cstring>
- #include <iomanip>
- 
-diff -Naur Omni-0.9.2.orig/DeviceMedia.cpp Omni-0.9.2/DeviceMedia.cpp
---- Omni-0.9.2.orig/DeviceMedia.cpp	2004-08-30 14:53:40.000000000 +0000
-+++ Omni-0.9.2/DeviceMedia.cpp	2008-09-02 13:25:54.442003551 +0000
-@@ -22,6 +22,7 @@
- 
- #include <cstdio>
- #include <cstring>
-+#include <cstdlib>
- 
- static PSZCRO vapszJobPropertyKeys[] = {
-    "media"
-diff -Naur Omni-0.9.2.orig/DeviceNUp.cpp Omni-0.9.2/DeviceNUp.cpp
---- Omni-0.9.2.orig/DeviceNUp.cpp	2004-08-30 14:53:33.000000000 +0000
-+++ Omni-0.9.2/DeviceNUp.cpp	2008-09-02 13:25:54.442003551 +0000
-@@ -22,6 +22,7 @@
- 
- #include <cstdio>
- #include <cstring>
-+#include <cstdlib>
- 
- static PSZCRO vapszJobPropertyKeys[] = {
-    "NumberUp",
-diff -Naur Omni-0.9.2.orig/DeviceOrientation.cpp Omni-0.9.2/DeviceOrientation.cpp
---- Omni-0.9.2.orig/DeviceOrientation.cpp	2004-08-30 14:53:21.000000000 +0000
-+++ Omni-0.9.2/DeviceOrientation.cpp	2008-09-02 13:25:54.442003551 +0000
-@@ -22,6 +22,7 @@
- 
- #include <cstdio>
- #include <cstring>
-+#include <cstdlib>
- 
- static PSZCRO vapszJobPropertyKeys[] = {
-    "Rotation"
-diff -Naur Omni-0.9.2.orig/DeviceOutputBin.cpp Omni-0.9.2/DeviceOutputBin.cpp
---- Omni-0.9.2.orig/DeviceOutputBin.cpp	2004-08-30 14:53:16.000000000 +0000
-+++ Omni-0.9.2/DeviceOutputBin.cpp	2008-09-02 13:25:54.443003748 +0000
-@@ -22,6 +22,7 @@
- 
- #include <cstdio>
- #include <cstring>
-+#include <cstdlib>
- 
- static PSZCRO vapszJobPropertyKeys[] = {
-    "OutputBin"
-diff -Naur Omni-0.9.2.orig/DevicePrintMode.cpp Omni-0.9.2/DevicePrintMode.cpp
---- Omni-0.9.2.orig/DevicePrintMode.cpp	2004-08-30 14:53:15.000000000 +0000
-+++ Omni-0.9.2/DevicePrintMode.cpp	2008-09-02 13:25:54.443003748 +0000
-@@ -22,6 +22,7 @@
- 
- #include <cstdio>
- #include <cstring>
-+#include <cstdlib>
- 
- static PSZCRO vapszJobPropertyKeys[] = {
-    "printmode"
-diff -Naur Omni-0.9.2.orig/DeviceResolution.cpp Omni-0.9.2/DeviceResolution.cpp
---- Omni-0.9.2.orig/DeviceResolution.cpp	2004-08-30 14:53:19.000000000 +0000
-+++ Omni-0.9.2/DeviceResolution.cpp	2008-09-02 13:25:54.444003945 +0000
-@@ -22,6 +22,7 @@
- 
- #include <cstdio>
- #include <cstring>
-+#include <cstdlib>
- 
- static PSZCRO vapszJobPropertyKeys[] = {
-    "Resolution"
-diff -Naur Omni-0.9.2.orig/DeviceScaling.cpp Omni-0.9.2/DeviceScaling.cpp
---- Omni-0.9.2.orig/DeviceScaling.cpp	2004-08-30 14:53:09.000000000 +0000
-+++ Omni-0.9.2/DeviceScaling.cpp	2008-09-02 13:25:54.444003945 +0000
-@@ -20,6 +20,8 @@
- #include "JobProperties.hpp"
- 
- #include <errno.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- static PSZCRO vapszJobPropertyKeys[] = {
-    "ScalingType",
-diff -Naur Omni-0.9.2.orig/DeviceSheetCollate.cpp Omni-0.9.2/DeviceSheetCollate.cpp
---- Omni-0.9.2.orig/DeviceSheetCollate.cpp	2004-08-30 14:53:25.000000000 +0000
-+++ Omni-0.9.2/DeviceSheetCollate.cpp	2008-09-02 13:25:54.445003792 +0000
-@@ -22,6 +22,7 @@
- 
- #include <cstdio>
- #include <cstring>
-+#include <cstdlib>
- 
- static PSZCRO vapszJobPropertyKeys[] = {
-    "SheetCollate"
-diff -Naur Omni-0.9.2.orig/DeviceSide.cpp Omni-0.9.2/DeviceSide.cpp
---- Omni-0.9.2.orig/DeviceSide.cpp	2004-08-30 14:53:36.000000000 +0000
-+++ Omni-0.9.2/DeviceSide.cpp	2008-09-02 13:25:54.445003792 +0000
-@@ -22,6 +22,7 @@
- 
- #include <cstdio>
- #include <cstring>
-+#include <cstdlib>
- 
- static PSZCRO vapszJobPropertyKeys[] = {
-    "Sides"
-diff -Naur Omni-0.9.2.orig/DeviceStitching.cpp Omni-0.9.2/DeviceStitching.cpp
---- Omni-0.9.2.orig/DeviceStitching.cpp	2004-08-30 14:53:15.000000000 +0000
-+++ Omni-0.9.2/DeviceStitching.cpp	2008-09-02 13:25:54.446003570 +0000
-@@ -19,6 +19,9 @@
- #include "DeviceStitching.hpp"
- #include "JobProperties.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- static PSZCRO vapszJobPropertyKeys[] = {
-    "StitchingPosition",
-    "StitchingReferenceEdge",
-diff -Naur Omni-0.9.2.orig/DeviceTester2.cpp Omni-0.9.2/DeviceTester2.cpp
---- Omni-0.9.2.orig/DeviceTester2.cpp	2003-11-14 18:22:08.000000000 +0000
-+++ Omni-0.9.2/DeviceTester2.cpp	2008-09-02 13:25:54.446003570 +0000
-@@ -21,6 +21,9 @@
- #include "Omni.hpp"
- #include "JobProperties.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #if 1
- 
- int
-diff -Naur Omni-0.9.2.orig/DeviceTester3.cpp Omni-0.9.2/DeviceTester3.cpp
---- Omni-0.9.2.orig/DeviceTester3.cpp	2003-03-20 22:19:43.000000000 +0000
-+++ Omni-0.9.2/DeviceTester3.cpp	2008-09-02 13:25:54.446003570 +0000
-@@ -19,6 +19,9 @@
- #include "Device.hpp"
- #include "Omni.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
-diff -Naur Omni-0.9.2.orig/DeviceTester4.cpp Omni-0.9.2/DeviceTester4.cpp
---- Omni-0.9.2.orig/DeviceTester4.cpp	2004-01-26 20:49:08.000000000 +0000
-+++ Omni-0.9.2/DeviceTester4.cpp	2008-09-02 13:25:54.447003767 +0000
-@@ -20,6 +20,9 @@
- #include "Omni.hpp"
- #include "JobProperties.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- // (source setit "test XMLDevice"; ./DeviceTester4 -sproperties='XMLMasterFile="Test Me.xml"' --driver XMLOmniDevice)
- 
- Device *
-diff -Naur Omni-0.9.2.orig/DeviceTester5.cpp Omni-0.9.2/DeviceTester5.cpp
---- Omni-0.9.2.orig/DeviceTester5.cpp	2003-11-14 18:22:08.000000000 +0000
-+++ Omni-0.9.2/DeviceTester5.cpp	2008-09-02 13:25:54.447003767 +0000
-@@ -21,6 +21,9 @@
- #include <Omni.hpp>
- #include <JobProperties.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- Device *
- loadDevice (PSZCRO    pszFullDeviceName,
-             PSZCRO    pszJobProperties,
-diff -Naur Omni-0.9.2.orig/DeviceTray.cpp Omni-0.9.2/DeviceTray.cpp
---- Omni-0.9.2.orig/DeviceTray.cpp	2004-08-30 14:53:37.000000000 +0000
-+++ Omni-0.9.2/DeviceTray.cpp	2008-09-02 13:25:54.447003767 +0000
-@@ -22,6 +22,7 @@
- 
- #include <cstdio>
- #include <cstring>
-+#include <cstdlib>
- 
- static PSZCRO vapszJobPropertyKeys[] = {
-    "InputTray"
-diff -Naur Omni-0.9.2.orig/DeviceTrimming.cpp Omni-0.9.2/DeviceTrimming.cpp
---- Omni-0.9.2.orig/DeviceTrimming.cpp	2004-08-30 14:53:13.000000000 +0000
-+++ Omni-0.9.2/DeviceTrimming.cpp	2008-09-02 13:25:54.448003475 +0000
-@@ -22,6 +22,7 @@
- 
- #include <cstdio>
- #include <cstring>
-+#include <cstdlib>
- 
- static PSZCRO vapszJobPropertyKeys[] = {
-    "Trimming"
-diff -Naur Omni-0.9.2.orig/DitherLibraryExample.cpp Omni-0.9.2/DitherLibraryExample.cpp
---- Omni-0.9.2.orig/DitherLibraryExample.cpp	2003-11-14 18:22:31.000000000 +0000
-+++ Omni-0.9.2/DitherLibraryExample.cpp	2008-09-02 13:25:54.448003475 +0000
-@@ -29,6 +29,8 @@
- #include "Device.hpp"
- #include "JobProperties.hpp"
- 
-+#include <cstring>
-+
- class DitherLibraryExample : public DeviceDither
- {
- public:
-diff -Naur Omni-0.9.2.orig/Enumeration.cpp Omni-0.9.2/Enumeration.cpp
---- Omni-0.9.2.orig/Enumeration.cpp	2004-08-26 19:47:25.000000000 +0000
-+++ Omni-0.9.2/Enumeration.cpp	2008-09-02 13:25:54.448003475 +0000
-@@ -19,6 +19,9 @@
- #include "Enumeration.hpp"
- #include "JobProperties.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- ArrayEnumerator::
- ArrayEnumerator (int cKeys, PSZCRO *aKeys)
- {
-diff -Naur Omni-0.9.2.orig/Epson/Epson ESC Blitter.cpp Omni-0.9.2/Epson/Epson ESC Blitter.cpp
---- Omni-0.9.2.orig/Epson/Epson ESC Blitter.cpp	2004-08-30 14:53:10.000000000 +0000
-+++ Omni-0.9.2/Epson/Epson ESC Blitter.cpp	2008-09-02 13:25:54.449003463 +0000
-@@ -19,6 +19,9 @@
- #include "Epson_ESC_Blitter.hpp"
- #include "Epson_ESC_Instance.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #include <DeviceOrientation.hpp>
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
-diff -Naur Omni-0.9.2.orig/Epson/Epson ESC Instance.cpp Omni-0.9.2/Epson/Epson ESC Instance.cpp
---- Omni-0.9.2.orig/Epson/Epson ESC Instance.cpp	2004-08-26 19:46:55.000000000 +0000
-+++ Omni-0.9.2/Epson/Epson ESC Instance.cpp	2008-09-02 13:25:54.449003463 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/Epson/Epson ESCP2 Blitter.cpp Omni-0.9.2/Epson/Epson ESCP2 Blitter.cpp
---- Omni-0.9.2.orig/Epson/Epson ESCP2 Blitter.cpp	2004-08-30 14:53:17.000000000 +0000
-+++ Omni-0.9.2/Epson/Epson ESCP2 Blitter.cpp	2008-09-02 13:25:54.450003799 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- const static bool fTestNoCompression = false;
- 
- int compressEpsonRLE (PBYTE  pbData,
-diff -Naur Omni-0.9.2.orig/Epson/Epson ESCP2 Instance.cpp Omni-0.9.2/Epson/Epson ESCP2 Instance.cpp
---- Omni-0.9.2.orig/Epson/Epson ESCP2 Instance.cpp	2004-08-26 19:47:04.000000000 +0000
-+++ Omni-0.9.2/Epson/Epson ESCP2 Instance.cpp	2008-09-02 13:25:54.451003926 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/Epson/Epson High Res ESCP2 Blitter.cpp Omni-0.9.2/Epson/Epson High Res ESCP2 Blitter.cpp
---- Omni-0.9.2.orig/Epson/Epson High Res ESCP2 Blitter.cpp	2004-01-26 20:49:25.000000000 +0000
-+++ Omni-0.9.2/Epson/Epson High Res ESCP2 Blitter.cpp	2008-09-02 13:25:54.452003774 +0000
-@@ -20,6 +20,9 @@
- #include "Epson_High_Res_ESCP2_Instance.hpp"
- #include "DeviceOrientation.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #include <stdio.h>
- 
- #define PERF_CHANGE 1
-diff -Naur Omni-0.9.2.orig/Epson/Epson High Res ESCP2 Instance.cpp Omni-0.9.2/Epson/Epson High Res ESCP2 Instance.cpp
---- Omni-0.9.2.orig/Epson/Epson High Res ESCP2 Instance.cpp	2004-08-26 19:46:59.000000000 +0000
-+++ Omni-0.9.2/Epson/Epson High Res ESCP2 Instance.cpp	2008-09-02 13:25:54.453003552 +0000
-@@ -19,6 +19,9 @@
- #include "Epson_High_Res_ESCP2_Instance.hpp"
- #include "defines.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #include <iostream>
- #include <sstream>
- 
-diff -Naur Omni-0.9.2.orig/Epson/Epson PCL Blitter.cpp Omni-0.9.2/Epson/Epson PCL Blitter.cpp
---- Omni-0.9.2.orig/Epson/Epson PCL Blitter.cpp	2004-08-30 14:53:10.000000000 +0000
-+++ Omni-0.9.2/Epson/Epson PCL Blitter.cpp	2008-09-02 13:25:54.454003679 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/Epson/Epson PCL Instance.cpp Omni-0.9.2/Epson/Epson PCL Instance.cpp
---- Omni-0.9.2.orig/Epson/Epson PCL Instance.cpp	2004-08-26 19:46:55.000000000 +0000
-+++ Omni-0.9.2/Epson/Epson PCL Instance.cpp	2008-09-02 13:25:54.455003876 +0000
-@@ -25,6 +25,8 @@
- #include <iostream>
- #include <sstream>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- DeviceInstance *
- createInstance (PrintDevice *pDevice)
-diff -Naur Omni-0.9.2.orig/Foomatic/OmniFoomaticGenerator.cpp Omni-0.9.2/Foomatic/OmniFoomaticGenerator.cpp
---- Omni-0.9.2.orig/Foomatic/OmniFoomaticGenerator.cpp	2004-08-30 16:06:02.000000000 +0000
-+++ Omni-0.9.2/Foomatic/OmniFoomaticGenerator.cpp	2008-09-02 13:25:54.456003794 +0000
-@@ -21,6 +21,8 @@
- #include <unistd.h>
- #include <sstream>
- #include <fstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- #include "Device.hpp"
- #include "Omni.hpp"
-diff -Naur Omni-0.9.2.orig/GhostscriptInterface.cpp Omni-0.9.2/GhostscriptInterface.cpp
---- Omni-0.9.2.orig/GhostscriptInterface.cpp	2003-11-14 18:22:31.000000000 +0000
-+++ Omni-0.9.2/GhostscriptInterface.cpp	2008-09-02 13:25:54.457003083 +0000
-@@ -21,6 +21,8 @@
- 
- #include <cstdio>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- /*--------------------------------------------------------------------------------*/
- /*                          GhostscriptInferfaceInit                              */
-diff -Naur Omni-0.9.2.orig/GplCompression.cpp Omni-0.9.2/GplCompression.cpp
---- Omni-0.9.2.orig/GplCompression.cpp	2003-03-20 22:20:07.000000000 +0000
-+++ Omni-0.9.2/GplCompression.cpp	2008-09-02 13:25:54.458003978 +0000
-@@ -19,6 +19,7 @@
- #include "GplCompression.hpp"
- #include "DevicePrintMode.hpp"
- 
-+#include <cstring>
- #include <cstdlib>
- 
- #include <memory>
-diff -Naur Omni-0.9.2.orig/GplDitherInstance.cpp Omni-0.9.2/GplDitherInstance.cpp
---- Omni-0.9.2.orig/GplDitherInstance.cpp	2003-11-14 18:22:19.000000000 +0000
-+++ Omni-0.9.2/GplDitherInstance.cpp	2008-09-02 13:25:54.466003458 +0000
-@@ -20,6 +20,7 @@
- #include "JobProperties.hpp"
- 
- #include <cmath>
-+#include <cstring>
- 
- #undef  MAX3
- #define MAX3(a, b, c)                        ((a) > (b) ? ((a) > (c) ? (a) : (c)) : (b) > (c) ? (b) : (c))
-diff -Naur Omni-0.9.2.orig/HP LaserJet/HP LaserJet PCL Blitter.cpp Omni-0.9.2/HP LaserJet/HP LaserJet PCL Blitter.cpp
---- Omni-0.9.2.orig/HP LaserJet/HP LaserJet PCL Blitter.cpp	2004-08-30 14:53:15.000000000 +0000
-+++ Omni-0.9.2/HP LaserJet/HP LaserJet PCL Blitter.cpp	2008-09-02 13:25:54.468003783 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/HP LaserJet/HP LaserJet PCL Instance.cpp Omni-0.9.2/HP LaserJet/HP LaserJet PCL Instance.cpp
---- Omni-0.9.2.orig/HP LaserJet/HP LaserJet PCL Instance.cpp	2004-08-26 19:47:01.000000000 +0000
-+++ Omni-0.9.2/HP LaserJet/HP LaserJet PCL Instance.cpp	2008-09-02 13:25:54.468003783 +0000
-@@ -25,6 +25,8 @@
- #include <iostream>
- #include <sstream>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- DeviceInstance *
- createInstance (PrintDevice *pDevice)
-diff -Naur Omni-0.9.2.orig/IBM/IBM 5577 Blitter.cpp Omni-0.9.2/IBM/IBM 5577 Blitter.cpp
---- Omni-0.9.2.orig/IBM/IBM 5577 Blitter.cpp	2004-08-30 14:53:32.000000000 +0000
-+++ Omni-0.9.2/IBM/IBM 5577 Blitter.cpp	2008-09-02 13:25:54.469003491 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/IBM/IBM 5577 Instance.cpp Omni-0.9.2/IBM/IBM 5577 Instance.cpp
---- Omni-0.9.2.orig/IBM/IBM 5577 Instance.cpp	2004-09-01 15:57:58.000000000 +0000
-+++ Omni-0.9.2/IBM/IBM 5577 Instance.cpp	2008-09-02 13:25:54.470003129 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/IBM/IBM ESC Blitter.cpp Omni-0.9.2/IBM/IBM ESC Blitter.cpp
---- Omni-0.9.2.orig/IBM/IBM ESC Blitter.cpp	2004-08-30 14:53:29.000000000 +0000
-+++ Omni-0.9.2/IBM/IBM ESC Blitter.cpp	2008-09-02 13:25:54.491004052 +0000
-@@ -23,6 +23,9 @@
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- int GrabPrintHeadBand (PBYTE pbBits,
-diff -Naur Omni-0.9.2.orig/IBM/IBM ESC Instance.cpp Omni-0.9.2/IBM/IBM ESC Instance.cpp
---- Omni-0.9.2.orig/IBM/IBM ESC Instance.cpp	2004-08-26 19:47:16.000000000 +0000
-+++ Omni-0.9.2/IBM/IBM ESC Instance.cpp	2008-09-02 13:25:54.491004052 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/IBM/IBM PCL Blitter.cpp Omni-0.9.2/IBM/IBM PCL Blitter.cpp
---- Omni-0.9.2.orig/IBM/IBM PCL Blitter.cpp	2004-08-30 14:53:29.000000000 +0000
-+++ Omni-0.9.2/IBM/IBM PCL Blitter.cpp	2008-09-02 13:25:54.493004027 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/IBM/IBM PCL Instance.cpp Omni-0.9.2/IBM/IBM PCL Instance.cpp
---- Omni-0.9.2.orig/IBM/IBM PCL Instance.cpp	2004-08-26 19:47:16.000000000 +0000
-+++ Omni-0.9.2/IBM/IBM PCL Instance.cpp	2008-09-02 13:25:54.494003735 +0000
-@@ -25,6 +25,8 @@
- #include <iostream>
- #include <sstream>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- DeviceInstance *
- createInstance (PrintDevice *pDevice)
-diff -Naur Omni-0.9.2.orig/IBM/IBM Pages Blitter.cpp Omni-0.9.2/IBM/IBM Pages Blitter.cpp
---- Omni-0.9.2.orig/IBM/IBM Pages Blitter.cpp	2004-08-30 14:53:36.000000000 +0000
-+++ Omni-0.9.2/IBM/IBM Pages Blitter.cpp	2008-09-02 13:25:54.492003551 +0000
-@@ -23,6 +23,9 @@
- #include "DeviceTray.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/IBM/IBM Pages Instance.cpp Omni-0.9.2/IBM/IBM Pages Instance.cpp
---- Omni-0.9.2.orig/IBM/IBM Pages Instance.cpp	2004-08-26 19:47:23.000000000 +0000
-+++ Omni-0.9.2/IBM/IBM Pages Instance.cpp	2008-09-02 13:25:54.492003551 +0000
-@@ -25,6 +25,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/IBM/IBM RPDL Blitter.cpp Omni-0.9.2/IBM/IBM RPDL Blitter.cpp
---- Omni-0.9.2.orig/IBM/IBM RPDL Blitter.cpp	2004-08-30 14:53:32.000000000 +0000
-+++ Omni-0.9.2/IBM/IBM RPDL Blitter.cpp	2008-09-02 13:25:54.494003735 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/IBM/IBM RPDL Instance.cpp Omni-0.9.2/IBM/IBM RPDL Instance.cpp
---- Omni-0.9.2.orig/IBM/IBM RPDL Instance.cpp	2004-08-26 19:45:20.000000000 +0000
-+++ Omni-0.9.2/IBM/IBM RPDL Instance.cpp	2008-09-02 13:25:54.495004002 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/JobDialog/Tester.cpp Omni-0.9.2/JobDialog/Tester.cpp
---- Omni-0.9.2.orig/JobDialog/Tester.cpp	2003-11-19 23:41:36.000000000 +0000
-+++ Omni-0.9.2/JobDialog/Tester.cpp	2008-09-02 13:25:54.495004002 +0000
-@@ -19,6 +19,8 @@
- #include <iostream>
- #include <memory>
- #include <string>
-+#include <cstring>
-+#include <cstdlib>
- 
- #include "OmniGSInterface.hpp"
- #include <Omni.hpp>
-diff -Naur Omni-0.9.2.orig/JobProperties.cpp Omni-0.9.2/JobProperties.cpp
---- Omni-0.9.2.orig/JobProperties.cpp	2004-08-26 19:46:51.000000000 +0000
-+++ Omni-0.9.2/JobProperties.cpp	2008-09-02 13:25:54.496003919 +0000
-@@ -21,6 +21,7 @@
- #include <iostream>
- #include <sstream>
- #include <cstdlib>
-+#include <cstring>
- 
- #define PRINT_VAR(x)   std::cerr << #x " = " << SAFE_PRINT_PSZ(x) << std::endl
- 
-diff -Naur Omni-0.9.2.orig/KS/KS ESC Blitter.cpp Omni-0.9.2/KS/KS ESC Blitter.cpp
---- Omni-0.9.2.orig/KS/KS ESC Blitter.cpp	2004-08-30 14:53:20.000000000 +0000
-+++ Omni-0.9.2/KS/KS ESC Blitter.cpp	2008-09-02 13:25:54.497003767 +0000
-@@ -23,6 +23,9 @@
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- int GrabPrintHeadBand (PBYTE pbBits,
-diff -Naur Omni-0.9.2.orig/KS/KS ESC Instance.cpp Omni-0.9.2/KS/KS ESC Instance.cpp
---- Omni-0.9.2.orig/KS/KS ESC Instance.cpp	2004-08-26 19:47:08.000000000 +0000
-+++ Omni-0.9.2/KS/KS ESC Instance.cpp	2008-09-02 13:25:54.497003767 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/Kyocera/Kyocera PCL Blitter.cpp Omni-0.9.2/Kyocera/Kyocera PCL Blitter.cpp
---- Omni-0.9.2.orig/Kyocera/Kyocera PCL Blitter.cpp	2004-08-30 14:53:26.000000000 +0000
-+++ Omni-0.9.2/Kyocera/Kyocera PCL Blitter.cpp	2008-09-02 13:25:54.498003685 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/Kyocera/Kyocera PCL Instance.cpp Omni-0.9.2/Kyocera/Kyocera PCL Instance.cpp
---- Omni-0.9.2.orig/Kyocera/Kyocera PCL Instance.cpp	2004-08-26 19:47:13.000000000 +0000
-+++ Omni-0.9.2/Kyocera/Kyocera PCL Instance.cpp	2008-09-02 13:25:54.499003532 +0000
-@@ -25,6 +25,8 @@
- #include <iostream>
- #include <sstream>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- DeviceInstance *
- createInstance (PrintDevice *pDevice)
-diff -Naur Omni-0.9.2.orig/MonoDither.cpp Omni-0.9.2/MonoDither.cpp
---- Omni-0.9.2.orig/MonoDither.cpp	2004-08-30 14:53:36.000000000 +0000
-+++ Omni-0.9.2/MonoDither.cpp	2008-09-02 13:25:54.499003532 +0000
-@@ -19,6 +19,8 @@
- #include "MonoDither.hpp"
- #include "Device.hpp"
- 
-+#include <cstring>
-+
- // Prebuilt Magic table for halftone ordered dithers - Alternate Set
- 
- static BYTE GammaTbl [256] = {
-diff -Naur Omni-0.9.2.orig/Okidata/OkiPos Blitter.cpp Omni-0.9.2/Okidata/OkiPos Blitter.cpp
---- Omni-0.9.2.orig/Okidata/OkiPos Blitter.cpp	2004-08-30 14:53:41.000000000 +0000
-+++ Omni-0.9.2/Okidata/OkiPos Blitter.cpp	2008-09-02 13:25:54.504003679 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- int GrabPrintHeadBand (PBYTE pbBits,
-diff -Naur Omni-0.9.2.orig/Okidata/OkiPos Instance.cpp Omni-0.9.2/Okidata/OkiPos Instance.cpp
---- Omni-0.9.2.orig/Okidata/OkiPos Instance.cpp	2004-08-26 19:46:49.000000000 +0000
-+++ Omni-0.9.2/Okidata/OkiPos Instance.cpp	2008-09-02 13:25:54.505003946 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/Okidata/Okidata ESC Blitter.cpp Omni-0.9.2/Okidata/Okidata ESC Blitter.cpp
---- Omni-0.9.2.orig/Okidata/Okidata ESC Blitter.cpp	2004-08-30 14:53:26.000000000 +0000
-+++ Omni-0.9.2/Okidata/Okidata ESC Blitter.cpp	2008-09-02 13:25:54.500003799 +0000
-@@ -23,6 +23,9 @@
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- int GrabPrintHeadBand (PBYTE pbBits,
-diff -Naur Omni-0.9.2.orig/Okidata/Okidata ESC Instance.cpp Omni-0.9.2/Okidata/Okidata ESC Instance.cpp
---- Omni-0.9.2.orig/Okidata/Okidata ESC Instance.cpp	2004-08-26 19:47:13.000000000 +0000
-+++ Omni-0.9.2/Okidata/Okidata ESC Instance.cpp	2008-09-02 13:25:54.500003799 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/Okidata/Okidata ESCP2 Blitter.cpp Omni-0.9.2/Okidata/Okidata ESCP2 Blitter.cpp
---- Omni-0.9.2.orig/Okidata/Okidata ESCP2 Blitter.cpp	2004-08-30 14:53:35.000000000 +0000
-+++ Omni-0.9.2/Okidata/Okidata ESCP2 Blitter.cpp	2008-09-02 13:25:54.501003926 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- const static bool fTestNoCompression = false;
- 
- int compressEpsonRLE (PBYTE  pbData,
-diff -Naur Omni-0.9.2.orig/Okidata/Okidata ESCP2 Instance.cpp Omni-0.9.2/Okidata/Okidata ESCP2 Instance.cpp
---- Omni-0.9.2.orig/Okidata/Okidata ESCP2 Instance.cpp	2004-08-26 19:47:22.000000000 +0000
-+++ Omni-0.9.2/Okidata/Okidata ESCP2 Instance.cpp	2008-09-02 13:25:54.502003914 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/Okidata/Okidata PCL Blitter.cpp Omni-0.9.2/Okidata/Okidata PCL Blitter.cpp
---- Omni-0.9.2.orig/Okidata/Okidata PCL Blitter.cpp	2004-08-30 14:53:25.000000000 +0000
-+++ Omni-0.9.2/Okidata/Okidata PCL Blitter.cpp	2008-09-02 13:25:54.502003914 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/Okidata/Okidata PCL Instance.cpp Omni-0.9.2/Okidata/Okidata PCL Instance.cpp
---- Omni-0.9.2.orig/Okidata/Okidata PCL Instance.cpp	2004-08-26 19:47:13.000000000 +0000
-+++ Omni-0.9.2/Okidata/Okidata PCL Instance.cpp	2008-09-02 13:25:54.503003761 +0000
-@@ -25,6 +25,8 @@
- #include <iostream>
- #include <sstream>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- DeviceInstance *
- createInstance (PrintDevice *pDevice)
-diff -Naur Omni-0.9.2.orig/Omni.cpp Omni-0.9.2/Omni.cpp
---- Omni-0.9.2.orig/Omni.cpp	2004-08-26 19:46:57.000000000 +0000
-+++ Omni-0.9.2/Omni.cpp	2008-09-02 13:25:54.506003724 +0000
-@@ -26,6 +26,7 @@
- #include <list>
- #include <set>
- #include <fstream>
-+#include <cstring>
- 
- #include <glob.h>
- #include <signal.h>
-diff -Naur Omni-0.9.2.orig/OmniDevice.cpp Omni-0.9.2/OmniDevice.cpp
---- Omni-0.9.2.orig/OmniDevice.cpp	2003-03-20 22:20:39.000000000 +0000
-+++ Omni-0.9.2/OmniDevice.cpp	2008-09-02 13:25:54.506003724 +0000
-@@ -19,6 +19,8 @@
- #include "OmniDevice.hpp"
- 
- #include <string>
-+#include <cstring>
-+#include <cstdlib>
- 
- OmniDevice::
- OmniDevice (PSZCRO pszLibraryName,
-diff -Naur Omni-0.9.2.orig/OmniDeviceOptions.cpp Omni-0.9.2/OmniDeviceOptions.cpp
---- Omni-0.9.2.orig/OmniDeviceOptions.cpp	2004-08-26 19:47:03.000000000 +0000
-+++ Omni-0.9.2/OmniDeviceOptions.cpp	2008-09-02 13:25:54.507004130 +0000
-@@ -26,6 +26,7 @@
- #include <memory>
- #include <string>
- #include <list>
-+#include <cstring>
- 
- #include <glib.h>
- #include <gmodule.h>
-diff -Naur Omni-0.9.2.orig/OmniDeviceValid.cpp Omni-0.9.2/OmniDeviceValid.cpp
---- Omni-0.9.2.orig/OmniDeviceValid.cpp	2003-11-14 18:22:36.000000000 +0000
-+++ Omni-0.9.2/OmniDeviceValid.cpp	2008-09-02 13:25:54.508003559 +0000
-@@ -18,6 +18,8 @@
-  */
- #include "Omni.hpp"
- 
-+#include <cstring>
-+
- void
- printUsage (int argc, char *argv[])
- {
-diff -Naur Omni-0.9.2.orig/OmniDevices.cpp Omni-0.9.2/OmniDevices.cpp
---- Omni-0.9.2.orig/OmniDevices.cpp	2003-11-14 18:22:30.000000000 +0000
-+++ Omni-0.9.2/OmniDevices.cpp	2008-09-02 13:25:54.507004130 +0000
-@@ -19,6 +19,8 @@
- #include "Device.hpp"
- #include "Omni.hpp"
- 
-+#include <cstring>
-+
- #include <glib.h>
- #include <gmodule.h>
- 
-diff -Naur Omni-0.9.2.orig/Panasonic/Panasonic ESC Blitter.cpp Omni-0.9.2/Panasonic/Panasonic ESC Blitter.cpp
---- Omni-0.9.2.orig/Panasonic/Panasonic ESC Blitter.cpp	2004-08-30 14:53:40.000000000 +0000
-+++ Omni-0.9.2/Panasonic/Panasonic ESC Blitter.cpp	2008-09-02 13:25:54.509003896 +0000
-@@ -23,6 +23,9 @@
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- int GrabPrintHeadBand (PBYTE pbBits,
-diff -Naur Omni-0.9.2.orig/Panasonic/Panasonic ESC Instance.cpp Omni-0.9.2/Panasonic/Panasonic ESC Instance.cpp
---- Omni-0.9.2.orig/Panasonic/Panasonic ESC Instance.cpp	2004-08-26 19:46:49.000000000 +0000
-+++ Omni-0.9.2/Panasonic/Panasonic ESC Instance.cpp	2008-09-02 13:25:54.509003896 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/Panasonic/Panasonic ESCP2 Blitter.cpp Omni-0.9.2/Panasonic/Panasonic ESCP2 Blitter.cpp
---- Omni-0.9.2.orig/Panasonic/Panasonic ESCP2 Blitter.cpp	2004-08-30 14:53:10.000000000 +0000
-+++ Omni-0.9.2/Panasonic/Panasonic ESCP2 Blitter.cpp	2008-09-02 13:25:54.510003813 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- const static bool fTestNoCompression = false;
- 
- int compressEpsonRLE (PBYTE  pbData,
-diff -Naur Omni-0.9.2.orig/Panasonic/Panasonic ESCP2 Instance.cpp Omni-0.9.2/Panasonic/Panasonic ESCP2 Instance.cpp
---- Omni-0.9.2.orig/Panasonic/Panasonic ESCP2 Instance.cpp	2004-08-26 19:46:55.000000000 +0000
-+++ Omni-0.9.2/Panasonic/Panasonic ESCP2 Instance.cpp	2008-09-02 13:25:54.511003940 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/PrintDevice.cpp Omni-0.9.2/PrintDevice.cpp
---- Omni-0.9.2.orig/PrintDevice.cpp	2004-08-30 14:53:40.000000000 +0000
-+++ Omni-0.9.2/PrintDevice.cpp	2008-09-02 13:25:54.512003858 +0000
-@@ -27,6 +27,7 @@
- #include <cstdio>
- #include <fstream>
- #include <vector>
-+#include <cstdlib>
- 
- #include <unistd.h>
- 
-diff -Naur Omni-0.9.2.orig/Star/Star ESC Blitter.cpp Omni-0.9.2/Star/Star ESC Blitter.cpp
---- Omni-0.9.2.orig/Star/Star ESC Blitter.cpp	2004-08-30 14:53:38.000000000 +0000
-+++ Omni-0.9.2/Star/Star ESC Blitter.cpp	2008-09-02 13:25:54.513003706 +0000
-@@ -23,6 +23,9 @@
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- int GrabPrintHeadBand (PBYTE pbBits,
-diff -Naur Omni-0.9.2.orig/Star/Star ESC Instance.cpp Omni-0.9.2/Star/Star ESC Instance.cpp
---- Omni-0.9.2.orig/Star/Star ESC Instance.cpp	2004-08-26 19:47:25.000000000 +0000
-+++ Omni-0.9.2/Star/Star ESC Instance.cpp	2008-09-02 13:25:54.513003706 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/Star/Star ESCP2 Blitter.cpp Omni-0.9.2/Star/Star ESCP2 Blitter.cpp
---- Omni-0.9.2.orig/Star/Star ESCP2 Blitter.cpp	2004-08-30 14:53:43.000000000 +0000
-+++ Omni-0.9.2/Star/Star ESCP2 Blitter.cpp	2008-09-02 13:25:54.514003833 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- const static bool fTestNoCompression = false;
- 
- int compressEpsonRLE (PBYTE  pbData,
-diff -Naur Omni-0.9.2.orig/Star/Star ESCP2 Instance.cpp Omni-0.9.2/Star/Star ESCP2 Instance.cpp
---- Omni-0.9.2.orig/Star/Star ESCP2 Instance.cpp	2004-08-26 19:46:53.000000000 +0000
-+++ Omni-0.9.2/Star/Star ESCP2 Instance.cpp	2008-09-02 13:25:54.515003890 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/StringResourceEn.cpp Omni-0.9.2/StringResourceEn.cpp
---- Omni-0.9.2.orig/StringResourceEn.cpp	2004-08-26 19:47:02.000000000 +0000
-+++ Omni-0.9.2/StringResourceEn.cpp	2008-09-02 13:25:54.516003808 +0000
-@@ -19,6 +19,9 @@
- #include "Device.hpp"
- #include "StringResourceEn.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- StringResourceEn::
- StringResourceEn (StringResource *pFallback)
- {
-diff -Naur Omni-0.9.2.orig/XMLDevice/Brother_ESC_Blitter.cpp Omni-0.9.2/XMLDevice/Brother_ESC_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Brother_ESC_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Brother_ESC_Blitter.cpp	2008-09-02 13:25:54.518003503 +0000
-@@ -19,6 +19,9 @@
- #include "Brother_ESC_Blitter.hpp"
- #include "Brother_ESC_Instance.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #include <DeviceOrientation.hpp>
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
-diff -Naur Omni-0.9.2.orig/XMLDevice/Brother_ESC_Instance.cpp Omni-0.9.2/XMLDevice/Brother_ESC_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Brother_ESC_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Brother_ESC_Instance.cpp	2008-09-02 13:25:54.519003700 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/Brother_PCL_Blitter.cpp Omni-0.9.2/XMLDevice/Brother_PCL_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Brother_PCL_Blitter.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Brother_PCL_Blitter.cpp	2008-09-02 13:25:54.519003700 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/XMLDevice/Brother_PCL_Instance.cpp Omni-0.9.2/XMLDevice/Brother_PCL_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Brother_PCL_Instance.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Brother_PCL_Instance.cpp	2008-09-02 13:25:54.520003757 +0000
-@@ -25,6 +25,8 @@
- #include <iostream>
- #include <sstream>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- DeviceInstance *
- createInstance (PrintDevice *pDevice)
-diff -Naur Omni-0.9.2.orig/XMLDevice/Canon_BJC_8500_Blitter.cpp Omni-0.9.2/XMLDevice/Canon_BJC_8500_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Canon_BJC_8500_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Canon_BJC_8500_Blitter.cpp	2008-09-02 13:25:54.521003535 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- const static bool fTestNoCompression = false;
-diff -Naur Omni-0.9.2.orig/XMLDevice/Canon_BJC_8500_Instance.cpp Omni-0.9.2/XMLDevice/Canon_BJC_8500_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Canon_BJC_8500_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Canon_BJC_8500_Instance.cpp	2008-09-02 13:25:54.521003535 +0000
-@@ -21,6 +21,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/Canon_Blitter.cpp Omni-0.9.2/XMLDevice/Canon_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Canon_Blitter.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Canon_Blitter.cpp	2008-09-02 13:25:54.522003592 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- const static bool fTestNoCompression = false;
-diff -Naur Omni-0.9.2.orig/XMLDevice/Canon_Instance.cpp Omni-0.9.2/XMLDevice/Canon_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Canon_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Canon_Instance.cpp	2008-09-02 13:25:54.523003789 +0000
-@@ -21,6 +21,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/Canon_S450_Blitter.cpp Omni-0.9.2/XMLDevice/Canon_S450_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Canon_S450_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Canon_S450_Blitter.cpp	2008-09-02 13:25:54.524003637 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- const static bool fTestNoCompression = false;
-diff -Naur Omni-0.9.2.orig/XMLDevice/Canon_S450_Instance.cpp Omni-0.9.2/XMLDevice/Canon_S450_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Canon_S450_Instance.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Canon_S450_Instance.cpp	2008-09-02 13:25:54.525003694 +0000
-@@ -21,6 +21,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/Epson_ESCP2_Blitter.cpp Omni-0.9.2/XMLDevice/Epson_ESCP2_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Epson_ESCP2_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Epson_ESCP2_Blitter.cpp	2008-09-02 13:25:54.527003739 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- const static bool fTestNoCompression = false;
- 
- int compressEpsonRLE (PBYTE  pbData,
-diff -Naur Omni-0.9.2.orig/XMLDevice/Epson_ESCP2_Instance.cpp Omni-0.9.2/XMLDevice/Epson_ESCP2_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Epson_ESCP2_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Epson_ESCP2_Instance.cpp	2008-09-02 13:25:54.527003739 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/Epson_ESC_Blitter.cpp Omni-0.9.2/XMLDevice/Epson_ESC_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Epson_ESC_Blitter.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Epson_ESC_Blitter.cpp	2008-09-02 13:25:54.526003612 +0000
-@@ -19,6 +19,9 @@
- #include "Epson_ESC_Blitter.hpp"
- #include "Epson_ESC_Instance.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #include <DeviceOrientation.hpp>
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
-diff -Naur Omni-0.9.2.orig/XMLDevice/Epson_ESC_Instance.cpp Omni-0.9.2/XMLDevice/Epson_ESC_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Epson_ESC_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Epson_ESC_Instance.cpp	2008-09-02 13:25:54.526003612 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/Epson_High_Res_ESCP2_Blitter.cpp Omni-0.9.2/XMLDevice/Epson_High_Res_ESCP2_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Epson_High_Res_ESCP2_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Epson_High_Res_ESCP2_Blitter.cpp	2008-09-02 13:25:54.529003784 +0000
-@@ -20,6 +20,9 @@
- #include "Epson_High_Res_ESCP2_Instance.hpp"
- #include "DeviceOrientation.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #include <stdio.h>
- 
- #define PERF_CHANGE 1
-diff -Naur Omni-0.9.2.orig/XMLDevice/Epson_High_Res_ESCP2_Instance.cpp Omni-0.9.2/XMLDevice/Epson_High_Res_ESCP2_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Epson_High_Res_ESCP2_Instance.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Epson_High_Res_ESCP2_Instance.cpp	2008-09-02 13:25:54.530003562 +0000
-@@ -19,6 +19,9 @@
- #include "Epson_High_Res_ESCP2_Instance.hpp"
- #include "defines.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #include <iostream>
- #include <sstream>
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/Epson_PCL_Blitter.cpp Omni-0.9.2/XMLDevice/Epson_PCL_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Epson_PCL_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Epson_PCL_Blitter.cpp	2008-09-02 13:25:54.530003562 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/XMLDevice/Epson_PCL_Instance.cpp Omni-0.9.2/XMLDevice/Epson_PCL_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Epson_PCL_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Epson_PCL_Instance.cpp	2008-09-02 13:25:54.553003901 +0000
-@@ -25,6 +25,8 @@
- #include <iostream>
- #include <sstream>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- DeviceInstance *
- createInstance (PrintDevice *pDevice)
-diff -Naur Omni-0.9.2.orig/XMLDevice/HP_LaserJet_PCL_Blitter.cpp Omni-0.9.2/XMLDevice/HP_LaserJet_PCL_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/HP_LaserJet_PCL_Blitter.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/HP_LaserJet_PCL_Blitter.cpp	2008-09-02 13:25:54.553003901 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/XMLDevice/HP_LaserJet_PCL_Instance.cpp Omni-0.9.2/XMLDevice/HP_LaserJet_PCL_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/HP_LaserJet_PCL_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/HP_LaserJet_PCL_Instance.cpp	2008-09-02 13:25:54.555003387 +0000
-@@ -25,6 +25,8 @@
- #include <iostream>
- #include <sstream>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- DeviceInstance *
- createInstance (PrintDevice *pDevice)
-diff -Naur Omni-0.9.2.orig/XMLDevice/IBM_5577_Blitter.cpp Omni-0.9.2/XMLDevice/IBM_5577_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/IBM_5577_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/IBM_5577_Blitter.cpp	2008-09-02 13:25:54.555003387 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/XMLDevice/IBM_5577_Instance.cpp Omni-0.9.2/XMLDevice/IBM_5577_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/IBM_5577_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/IBM_5577_Instance.cpp	2008-09-02 13:25:54.556003863 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/IBM_ESC_Blitter.cpp Omni-0.9.2/XMLDevice/IBM_ESC_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/IBM_ESC_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/IBM_ESC_Blitter.cpp	2008-09-02 13:25:54.557003851 +0000
-@@ -23,6 +23,9 @@
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- int GrabPrintHeadBand (PBYTE pbBits,
-diff -Naur Omni-0.9.2.orig/XMLDevice/IBM_ESC_Instance.cpp Omni-0.9.2/XMLDevice/IBM_ESC_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/IBM_ESC_Instance.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/IBM_ESC_Instance.cpp	2008-09-02 13:25:54.557003851 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/IBM_PCL_Blitter.cpp Omni-0.9.2/XMLDevice/IBM_PCL_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/IBM_PCL_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/IBM_PCL_Blitter.cpp	2008-09-02 13:25:54.559003546 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/XMLDevice/IBM_PCL_Instance.cpp Omni-0.9.2/XMLDevice/IBM_PCL_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/IBM_PCL_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/IBM_PCL_Instance.cpp	2008-09-02 13:25:54.560003464 +0000
-@@ -25,6 +25,8 @@
- #include <iostream>
- #include <sstream>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- DeviceInstance *
- createInstance (PrintDevice *pDevice)
-diff -Naur Omni-0.9.2.orig/XMLDevice/IBM_Pages_Blitter.cpp Omni-0.9.2/XMLDevice/IBM_Pages_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/IBM_Pages_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/IBM_Pages_Blitter.cpp	2008-09-02 13:25:54.558003838 +0000
-@@ -23,6 +23,9 @@
- #include "DeviceTray.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/XMLDevice/IBM_Pages_Instance.cpp Omni-0.9.2/XMLDevice/IBM_Pages_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/IBM_Pages_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/IBM_Pages_Instance.cpp	2008-09-02 13:25:54.558003838 +0000
-@@ -25,6 +25,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/KS_ESC_Blitter.cpp Omni-0.9.2/XMLDevice/KS_ESC_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/KS_ESC_Blitter.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/KS_ESC_Blitter.cpp	2008-09-02 13:25:54.560003464 +0000
-@@ -23,6 +23,9 @@
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- int GrabPrintHeadBand (PBYTE pbBits,
-diff -Naur Omni-0.9.2.orig/XMLDevice/KS_ESC_Instance.cpp Omni-0.9.2/XMLDevice/KS_ESC_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/KS_ESC_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/KS_ESC_Instance.cpp	2008-09-02 13:25:54.561004010 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/Kyocera_PCL_Blitter.cpp Omni-0.9.2/XMLDevice/Kyocera_PCL_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Kyocera_PCL_Blitter.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Kyocera_PCL_Blitter.cpp	2008-09-02 13:25:54.562003788 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/XMLDevice/Kyocera_PCL_Instance.cpp Omni-0.9.2/XMLDevice/Kyocera_PCL_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Kyocera_PCL_Instance.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Kyocera_PCL_Instance.cpp	2008-09-02 13:25:54.562003788 +0000
-@@ -25,6 +25,8 @@
- #include <iostream>
- #include <sstream>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- DeviceInstance *
- createInstance (PrintDevice *pDevice)
-diff -Naur Omni-0.9.2.orig/XMLDevice/OkiPos_Blitter.cpp Omni-0.9.2/XMLDevice/OkiPos_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/OkiPos_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/OkiPos_Blitter.cpp	2008-09-02 13:25:54.568003992 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- int GrabPrintHeadBand (PBYTE pbBits,
-diff -Naur Omni-0.9.2.orig/XMLDevice/OkiPos_Instance.cpp Omni-0.9.2/XMLDevice/OkiPos_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/OkiPos_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/OkiPos_Instance.cpp	2008-09-02 13:25:54.568003992 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/Okidata_ESCP2_Blitter.cpp Omni-0.9.2/XMLDevice/Okidata_ESCP2_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Okidata_ESCP2_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Okidata_ESCP2_Blitter.cpp	2008-09-02 13:25:54.565003541 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- const static bool fTestNoCompression = false;
- 
- int compressEpsonRLE (PBYTE  pbData,
-diff -Naur Omni-0.9.2.orig/XMLDevice/Okidata_ESCP2_Instance.cpp Omni-0.9.2/XMLDevice/Okidata_ESCP2_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Okidata_ESCP2_Instance.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Okidata_ESCP2_Instance.cpp	2008-09-02 13:25:54.565003541 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/Okidata_ESC_Blitter.cpp Omni-0.9.2/XMLDevice/Okidata_ESC_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Okidata_ESC_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Okidata_ESC_Blitter.cpp	2008-09-02 13:25:54.563003845 +0000
-@@ -23,6 +23,9 @@
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- int GrabPrintHeadBand (PBYTE pbBits,
-diff -Naur Omni-0.9.2.orig/XMLDevice/Okidata_ESC_Instance.cpp Omni-0.9.2/XMLDevice/Okidata_ESC_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Okidata_ESC_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Okidata_ESC_Instance.cpp	2008-09-02 13:25:54.564003763 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/Okidata_PCL_Blitter.cpp Omni-0.9.2/XMLDevice/Okidata_PCL_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Okidata_PCL_Blitter.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Okidata_PCL_Blitter.cpp	2008-09-02 13:25:54.566003458 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- DeviceBlitter *
- createBlitter (PrintDevice *pDevice)
- {
-diff -Naur Omni-0.9.2.orig/XMLDevice/Okidata_PCL_Instance.cpp Omni-0.9.2/XMLDevice/Okidata_PCL_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Okidata_PCL_Instance.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Okidata_PCL_Instance.cpp	2008-09-02 13:25:54.567003446 +0000
-@@ -25,6 +25,8 @@
- #include <iostream>
- #include <sstream>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- DeviceInstance *
- createInstance (PrintDevice *pDevice)
-diff -Naur Omni-0.9.2.orig/XMLDevice/Panasonic_ESCP2_Blitter.cpp Omni-0.9.2/XMLDevice/Panasonic_ESCP2_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Panasonic_ESCP2_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Panasonic_ESCP2_Blitter.cpp	2008-09-02 13:25:54.570003617 +0000
-@@ -21,6 +21,9 @@
- #include "DeviceOrientation.hpp"
- #include <CMYKbitmap.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- const static bool fTestNoCompression = false;
- 
- int compressEpsonRLE (PBYTE  pbData,
-diff -Naur Omni-0.9.2.orig/XMLDevice/Panasonic_ESCP2_Instance.cpp Omni-0.9.2/XMLDevice/Panasonic_ESCP2_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Panasonic_ESCP2_Instance.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Panasonic_ESCP2_Instance.cpp	2008-09-02 13:25:54.571003395 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/Panasonic_ESC_Blitter.cpp Omni-0.9.2/XMLDevice/Panasonic_ESC_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Panasonic_ESC_Blitter.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Panasonic_ESC_Blitter.cpp	2008-09-02 13:25:54.569003840 +0000
-@@ -23,6 +23,9 @@
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- int GrabPrintHeadBand (PBYTE pbBits,
-diff -Naur Omni-0.9.2.orig/XMLDevice/Panasonic_ESC_Instance.cpp Omni-0.9.2/XMLDevice/Panasonic_ESC_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Panasonic_ESC_Instance.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Panasonic_ESC_Instance.cpp	2008-09-02 13:25:54.569003840 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/Star_ESC_Blitter.cpp Omni-0.9.2/XMLDevice/Star_ESC_Blitter.cpp
---- Omni-0.9.2.orig/XMLDevice/Star_ESC_Blitter.cpp	2004-01-26 22:13:07.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Star_ESC_Blitter.cpp	2008-09-02 13:25:54.571003395 +0000
-@@ -23,6 +23,9 @@
- #include <CMYKbitmap.hpp>
- #include <defines.hpp>
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
- 
- int GrabPrintHeadBand (PBYTE pbBits,
-diff -Naur Omni-0.9.2.orig/XMLDevice/Star_ESC_Instance.cpp Omni-0.9.2/XMLDevice/Star_ESC_Instance.cpp
---- Omni-0.9.2.orig/XMLDevice/Star_ESC_Instance.cpp	2004-01-26 22:13:08.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/Star_ESC_Instance.cpp	2008-09-02 13:25:54.572003872 +0000
-@@ -23,6 +23,8 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- const static bool fTestNoCompression = true;
- 
-diff -Naur Omni-0.9.2.orig/XMLDevice/XMLDevice.hpp Omni-0.9.2/XMLDevice/XMLDevice.hpp
---- Omni-0.9.2.orig/XMLDevice/XMLDevice.hpp	2004-06-09 15:26:09.000000000 +0000
-+++ Omni-0.9.2/XMLDevice/XMLDevice.hpp	2008-09-02 13:25:54.572003872 +0000
-@@ -23,6 +23,8 @@
- #include <OmniProxy.hpp>
- 
- #include <map>
-+#include <cstring>
-+#include <cstdlib>
- 
- #include "XMLInterface.hpp"
- 
-diff -Naur Omni-0.9.2.orig/test/TestDeviceObjects.cpp Omni-0.9.2/test/TestDeviceObjects.cpp
---- Omni-0.9.2.orig/test/TestDeviceObjects.cpp	2003-12-19 16:01:22.000000000 +0000
-+++ Omni-0.9.2/test/TestDeviceObjects.cpp	2008-09-02 13:25:54.517003725 +0000
-@@ -18,6 +18,8 @@
-  */
- #include <iostream>
- #include <set>
-+#include <cstring>
-+#include <cstdlib>
- 
- #include "Device.hpp"
- #include "Omni.hpp"
-diff -Naur Omni-0.9.2.orig/test/TestGhostscript.cpp Omni-0.9.2/test/TestGhostscript.cpp
---- Omni-0.9.2.orig/test/TestGhostscript.cpp	2003-12-19 16:01:40.000000000 +0000
-+++ Omni-0.9.2/test/TestGhostscript.cpp	2008-09-02 13:25:54.518003503 +0000
-@@ -17,6 +17,8 @@
-  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-  */
- #include <iostream>
-+#include <cstring>
-+#include <cstdlib>
- 
- #include <sys/stat.h>
- 
diff --git a/net-print/omni/files/OmniEpsonVendor-0.9.2-gcc43.patch b/net-print/omni/files/OmniEpsonVendor-0.9.2-gcc43.patch
deleted file mode 100644
index 67d353cca008..000000000000
--- a/net-print/omni/files/OmniEpsonVendor-0.9.2-gcc43.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
-Date: 2008-09-02
-Initial Package Version: 0.9.2
-Origin: me
-Upstream Status: unknown
-Description: Make it compile with gcc 4.3
- 
-diff -Naur VendorSupplied.orig/Epson.PDC/OmniEpsonBlitter.cpp VendorSupplied/Epson.PDC/OmniEpsonBlitter.cpp
---- VendorSupplied.orig/Epson.PDC/OmniEpsonBlitter.cpp	2004-06-09 14:12:53.000000000 +0000
-+++ VendorSupplied/Epson.PDC/OmniEpsonBlitter.cpp	2008-09-02 13:24:03.118003224 +0000
-@@ -111,6 +111,9 @@
- #include "Omni.hpp"
- #include "JobProperties.hpp"
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- /****************************************************************************/
- /* Epson changable...                                                       */
- /****************************************************************************/
diff --git a/net-print/omni/files/omni-0.9.1-cxx.patch b/net-print/omni/files/omni-0.9.1-cxx.patch
deleted file mode 100644
index b258283391f2..000000000000
--- a/net-print/omni/files/omni-0.9.1-cxx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur Omni/OmniPDCProxy.cpp ../../Omni.patch2/OmniPDCProxy.cpp
---- Omni/OmniPDCProxy.cpp	2003-11-18 00:13:21.000000000 +0100
-+++ ../../Omni.patch2/OmniPDCProxy.cpp	2005-06-28 01:51:11.000000000 +0200
-@@ -787,7 +787,7 @@
-          && PDCCMD_ACK == pCmd_d->getCommandType ()
-          )
-       {
--          pCmd_d->getCommandInt ((int)eOmniClass_d);
-+          pCmd_d->getCommandInt ((int&)eOmniClass_d);
-       }
-       else
-       {
diff --git a/net-print/omni/files/omni-0.9.1-errno.patch b/net-print/omni/files/omni-0.9.1-errno.patch
deleted file mode 100644
index 6cfd615238c2..000000000000
--- a/net-print/omni/files/omni-0.9.1-errno.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur Omni/DeviceScaling.cpp ../../Omni.patch/DeviceScaling.cpp
---- Omni/DeviceScaling.cpp	2003-12-12 00:11:28.000000000 +0100
-+++ ../../Omni.patch/DeviceScaling.cpp	2005-06-27 17:01:30.000000000 +0200
-@@ -16,6 +16,7 @@
-  *   along with this library; if not, write to the Free Software
-  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-  */
-+#include <errno.h>
- #include "DeviceScaling.hpp"
- #include "JobProperties.hpp"
- 
diff --git a/net-print/omni/metadata.xml b/net-print/omni/metadata.xml
deleted file mode 100644
index fc7405b3b96b..000000000000
--- a/net-print/omni/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>printing</herd>
-<use>
-	<flag name='epson'>include the epson drivers</flag>
-</use>
-</pkgmetadata>
diff --git a/net-print/omni/omni-0.9.1.ebuild b/net-print/omni/omni-0.9.1.ebuild
deleted file mode 100644
index d876c33f7f23..000000000000
--- a/net-print/omni/omni-0.9.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/omni/omni-0.9.1.ebuild,v 1.7 2008/07/11 07:33:44 remi Exp $
-
-inherit eutils
-
-DESCRIPTION="Omni provides support for many printers with a pluggable framework (easy to add devices)"
-HOMEPAGE="http://sourceforge.net/projects/omniprint"
-SRC_URI="mirror://sourceforge/omniprint/${P/o/O}.tar.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86"
-DEPEND=""
-RDEPEND="virtual/ghostscript
-	>=dev-libs/libxml-1.8.6
-	=dev-libs/glib-1*
-	cups? ( >=net-print/cups-1.1.14 )
-	X? ( =dev-cpp/gtkmm-1.2* )
-	=dev-libs/libsigc++-1.0*
-	foomaticdb? ( net-print/foomatic-db-engine )"
-
-S="${WORKDIR}/Omni"
-
-IUSE="cups X ppds foomaticdb static"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-errno.patch
-	epatch ${FILESDIR}/${P}-cxx.patch
-}
-
-src_compile() {
-	local myconf=" \
-		$(use_enable X jobdialog) \
-		$(use_enable cups) \
-		$(use_enable static)"
-
-	export WANT_AUTOMAKE="1.6"
-	export WANT_AUTOCONF="2.5"
-
-	libtoolize --copy --force
-
-	LC_ALL="" LC_NUMERIC="" LANG="" ./setupOmni ${myconf} || die
-
-	if use ppds && use cups; then
-		sed -i -e "s/model\/foomatic/model\/omni/g" CUPS/Makefile \
-			|| die 'sed failed'
-		make -C CUPS generateBuildPPDs || die
-	fi
-
-	if use foomaticdb; then
-		make -C Foomatic generateFoomaticData || die
-	fi
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	if use foomaticdb; then
-		make -C Foomatic DESTDIR=${D} localInstall || die
-	fi
-	dodoc docs/*  # never forget this! ;-)
-}
diff --git a/net-print/omni/omni-0.9.2.ebuild b/net-print/omni/omni-0.9.2.ebuild
deleted file mode 100644
index a551f0461015..000000000000
--- a/net-print/omni/omni-0.9.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/omni/omni-0.9.2.ebuild,v 1.9 2008/11/23 19:25:07 halcy0n Exp $
-
-WANT_AUTOMAKE="1.6"
-WANT_AUTOCONF="latest"
-
-inherit eutils autotools
-
-DESCRIPTION="Omni provides support for many printers with a pluggable framework (easy to add devices)"
-HOMEPAGE="http://sourceforge.net/projects/omniprint"
-SRC_URI="mirror://sourceforge/omniprint/${P/o/O}.tar.gz
-	doc? ( mirror://sourceforge/omniprint/OmniArchitecture.0.3.pdf )
-	epson? ( mirror://sourceforge/omniprint/OmniEpsonVendor-${PV}.tar.gz )
-	foomaticdb? ( mirror://gentoo/omni-${PV}-foomatic.tar.bz2 )"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~ppc x86"
-DEPEND=""
-RDEPEND="virtual/ghostscript
-	dev-libs/libxml2
-	=dev-libs/glib-1*
-	cups? ( >=net-print/cups-1.1.14 )
-	X? ( =dev-cpp/gtkmm-1.2* )
-	=dev-libs/libsigc++-1.0*
-	foomaticdb? ( net-print/foomatic-db-engine )"
-
-S="${WORKDIR}/Omni"
-
-IUSE="cups X ppds foomaticdb static doc epson"
-
-src_unpack() {
-	unpack ${P/o/O}.tar.gz
-	cd "${S}"
-	epatch "${FILESDIR}"/Omni-0.9.2-gcc43.patch
-	if use epson; then
-		unpack OmniEpsonVendor-${PV}.tar.gz
-		epatch "${FILESDIR}"/OmniEpsonVendor-0.9.2-gcc43.patch
-	fi
-}
-
-src_compile() {
-	local myconf=" \
-		$(use_enable X jobdialog) \
-		$(use_enable cups) \
-		$(use_enable static)"
-
-	eautoreconf
-
-	LC_ALL="" LC_NUMERIC="" LANG="" ./setupOmni ${myconf} --disable-device-xml --enable-device-compile \
-		|| die "setup0mni failed"
-
-	if use ppds && use cups; then
-		sed -i -e "s/model\/foomatic/model\/omni/g" CUPS/Makefile \
-			|| die 'sed failed'
-		make -C CUPS generateBuildPPDs || die "make failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc docs/*  # never forget this! ;-)
-	use doc && dodoc "${DISTDIR}"/OmniArchitecture.0.3.pdf
-
-	if use foomaticdb; then
-		cd "${D}"
-		unpack omni-${PV}-foomatic.tar.bz2
-	fi
-}