diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-02-04 14:41:54 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-02-04 14:41:54 +0000 |
| commit | fb0cd345dc653ff1acef668c48c522b2467da8dd (patch) | |
| tree | 50909777cece51d58330ba7d542baafe69281139 /icc | |
| parent | 6b585f9f87de967b905418e5ec2686332be245f1 (diff) | |
INTEGRATION: CWS gcc430icc (1.5.2); FILE MERGED
2008/01/31 14:56:10 rene 1.5.2.1: #i85771# gcc 4.3.0 buildfix for icc from pmladek
Diffstat (limited to 'icc')
| -rw-r--r-- | icc/SampleICC-1.3.2.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/icc/SampleICC-1.3.2.patch b/icc/SampleICC-1.3.2.patch index d978dff1f4d6..ed072b63afaa 100644 --- a/icc/SampleICC-1.3.2.patch +++ b/icc/SampleICC-1.3.2.patch @@ -5034,3 +5034,53 @@ IccProfLibTest \ IccStripUnknownTags \ IccV4ToMPE +*** misc/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp 2007-08-20 22:04:53.000000000 +0200 +--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp 2008-01-31 13:53:16.000000000 +0100 +*************** +*** 77,82 **** +--- 77,84 ---- + // + ////////////////////////////////////////////////////////////////////// + ++ #include <stdlib.h> ++ #include <string.h> + #include <iostream> + #include <fstream> + #include <sstream> +*** misc/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h 2007-08-20 22:04:54.000000000 +0200 +--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h 2008-01-31 13:54:51.000000000 +0100 +*************** +*** 83,88 **** +--- 83,89 ---- + #ifndef __DEFINED_ICC_TOOL_EXCEPTION_H__ + #define __DEFINED_ICC_TOOL_EXCEPTION_H__ + ++ #include <string.h> + #include <exception> + #include <string> + +*** misc/SampleICC-1.3.2/IccProfLib/IccCmm.cpp 2007-08-20 22:05:00.000000000 +0200 +--- misc/build/SampleICC-1.3.2/IccProfLib/IccCmm.cpp 2008-01-31 13:49:54.000000000 +0100 +*************** +*** 79,84 **** +--- 79,86 ---- + #pragma warning( disable: 4786) //disable warning in <list.h> + #endif + ++ #include <stdlib.h> ++ #include <string.h> + #include "IccCmm.h" + #include "IccTag.h" + #include "IccIO.h" +*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h 2007-08-20 22:04:53.000000000 +0200 +--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h 2008-01-31 14:05:58.000000000 +0100 +*************** +*** 83,88 **** +--- 83,89 ---- + #include <string> + #include <sys/types.h> + #include <sys/stat.h> ++ #include <stdlib.h> + + #ifdef WIN32 + typedef unsigned short mode_t; |