fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2013-02-02 21:26 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* contrib/hbssl/hbssl.hbm
    * suppressed a gazillion of warnings where Apple was
      telling us that OpenSSL - as a whole - is deprecated
      since OS X Lion 10.7

  * src/3rd/tiff/tiff.dif
  * src/3rd/tiff/tiffconf.h
    ! fixed a zillion warnings when compiled on OS X
This commit is contained in:
Viktor Szakats
2013-02-02 20:28:30 +00:00
parent 8d6b43f3a2
commit a247e7d81f
4 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog.txt
View File

@@ -10,6 +10,16 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2013-02-02 21:26 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/hbssl/hbssl.hbm
* suppressed a gazillion of warnings where Apple was
telling us that OpenSSL - as a whole - is deprecated
since OS X Lion 10.7
* src/3rd/tiff/tiff.dif
* src/3rd/tiff/tiffconf.h
! fixed a zillion warnings when compiled on OS X
2013-02-02 20:42 UTC+0100 Viktor Szakats (harbour syenar.net)
* config/bsd/clang.mk
* config/darwin/clang.mk

6
harbour/contrib/hbssl/hbssl.hbm
View File

@@ -28,9 +28,13 @@
{darwin}-cflag=-DOPENSSL_NO_DGRAM
{darwin}-cflag=-DHB_OPENSSL_OLD_OSX_
# Patent will expire in 2010/2011
# Patent expires in 2010/2011
-cflag=-DOPENSSL_NO_IDEA
# to suppress Apple's deprecation warnings that apply to
# the complete OpenSSL API, starting with OS X Lion 10.7
-cflag={allgcc&darwin}-Wno-deprecated
# For _fileno() in openssl/applink.c
-c=gnu90

56
harbour/src/3rd/tiff/tiff.dif
View File

@@ -1,6 +1,6 @@
diff -urN tiff.orig\dirread.c tiff\dirread.c
--- tiff.orig\dirread.c Sat Sep 29 22:03:17 2012
+++ tiff\dirread.c Sat Sep 29 22:03:18 2012
--- tiff.orig\dirread.c Sat Feb 02 20:52:59 2013
+++ tiff\dirread.c Sat Feb 02 20:52:59 2013
@@ -2216,7 +2216,7 @@
case TIFF_FLOAT:
if (tif->tif_flags&TIFF_SWAB)
@@ -37,8 +37,8 @@ diff -urN tiff.orig\dirread.c tiff\dirread.c
static enum TIFFReadDirEntryErr
TIFFReadDirEntryCheckRangeSlong8Long8(uint64 value)
diff -urN tiff.orig\dirwrite.c tiff\dirwrite.c
--- tiff.orig\dirwrite.c Sat Sep 29 22:03:17 2012
+++ tiff\dirwrite.c Sat Sep 29 22:03:18 2012
--- tiff.orig\dirwrite.c Sat Feb 02 20:52:59 2013
+++ tiff\dirwrite.c Sat Feb 02 20:52:59 2013
@@ -2238,7 +2238,7 @@
{
assert(count<0x40000000);
@@ -58,8 +58,8 @@ diff -urN tiff.orig\dirwrite.c tiff\dirwrite.c
TIFFSwabArrayOfDouble(value,count);
return(TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_DOUBLE,count,count*8,value));
diff -urN tiff.orig\dumpmode.c tiff\dumpmode.c
--- tiff.orig\dumpmode.c Sat Sep 29 22:03:17 2012
+++ tiff\dumpmode.c Sat Sep 29 22:03:18 2012
--- tiff.orig\dumpmode.c Sat Feb 02 20:52:59 2013
+++ tiff\dumpmode.c Sat Feb 02 20:52:59 2013
@@ -80,19 +80,11 @@
static const char module[] = "DumpModeDecode";
(void) s;
@@ -84,8 +84,8 @@ diff -urN tiff.orig\dumpmode.c tiff\dumpmode.c
}
/*
diff -urN tiff.orig\luv.c tiff\luv.c
--- tiff.orig\luv.c Sat Sep 29 22:03:18 2012
+++ tiff\luv.c Sat Sep 29 22:03:18 2012
--- tiff.orig\luv.c Sat Feb 02 20:52:59 2013
+++ tiff\luv.c Sat Feb 02 20:52:59 2013
@@ -224,17 +224,10 @@
tp[i++] |= (int16)*bp++ << shft;
}
@@ -147,8 +147,8 @@ diff -urN tiff.orig\luv.c tiff\luv.c
tif->tif_rawcc = cc;
return (0);
diff -urN tiff.orig\lzw.c tiff\lzw.c
--- tiff.orig\lzw.c Sat Sep 29 22:03:18 2012
+++ tiff\lzw.c Sat Sep 29 22:03:18 2012
--- tiff.orig\lzw.c Sat Feb 02 20:52:59 2013
+++ tiff\lzw.c Sat Feb 02 20:52:59 2013
@@ -549,15 +549,9 @@
sp->dec_maxcodep = maxcodep;
@@ -186,8 +186,8 @@ diff -urN tiff.orig\lzw.c tiff\lzw.c
}
return (1);
diff -urN tiff.orig\print.c tiff\print.c
--- tiff.orig\print.c Sat Sep 29 22:03:18 2012
+++ tiff\print.c Sat Sep 29 22:03:18 2012
--- tiff.orig\print.c Sat Feb 02 20:52:59 2013
+++ tiff\print.c Sat Feb 02 20:52:59 2013
@@ -98,27 +98,13 @@
|| fip->field_type == TIFF_FLOAT)
fprintf(fd, "%f", ((float *) raw_data)[j]);
@@ -278,8 +278,8 @@ diff -urN tiff.orig\print.c tiff\print.c
}
diff -urN tiff.orig\read.c tiff\read.c
--- tiff.orig\read.c Sat Sep 29 22:03:18 2012
+++ tiff\read.c Sat Sep 29 22:03:18 2012
--- tiff.orig\read.c Sat Feb 02 20:52:59 2013
+++ tiff\read.c Sat Feb 02 20:52:59 2013
@@ -125,19 +125,11 @@
cc = TIFFReadFile(tif, tif->tif_rawdata + unused_data, to_read);
@@ -491,8 +491,8 @@ diff -urN tiff.orig\read.c tiff\read.c
}
if (isMapped(tif) &&
diff -urN tiff.orig\strip.c tiff\strip.c
--- tiff.orig\strip.c Sat Sep 29 22:03:18 2012
+++ tiff\strip.c Sat Sep 29 22:03:18 2012
--- tiff.orig\strip.c Sat Feb 02 20:52:59 2013
+++ tiff\strip.c Sat Feb 02 20:52:59 2013
@@ -154,17 +154,10 @@
if (bytecount == 0)
@@ -514,8 +514,8 @@ diff -urN tiff.orig\strip.c tiff\strip.c
}
diff -urN tiff.orig\thunder.c tiff\thunder.c
--- tiff.orig\thunder.c Sat Sep 29 22:03:18 2012
+++ tiff\thunder.c Sat Sep 29 22:03:18 2012
--- tiff.orig\thunder.c Sat Feb 02 20:52:59 2013
+++ tiff\thunder.c Sat Feb 02 20:52:59 2013
@@ -143,21 +143,12 @@
tif->tif_rawcp = (uint8*) bp;
tif->tif_rawcc = cc;
@@ -542,8 +542,8 @@ diff -urN tiff.orig\thunder.c tiff\thunder.c
}
diff -urN tiff.orig\tiffconf.h tiff\tiffconf.h
--- tiff.orig\tiffconf.h Sat Sep 29 22:03:18 2012
+++ tiff\tiffconf.h Sat Sep 29 22:03:18 2012
--- tiff.orig\tiffconf.h Sat Feb 02 20:52:59 2013
+++ tiff\tiffconf.h Sat Feb 02 20:52:59 2013
@@ -7,44 +7,65 @@
#ifndef _TIFFCONF_
#define _TIFFCONF_
@@ -682,11 +682,12 @@ diff -urN tiff.orig\tiffconf.h tiff\tiffconf.h
/* Support strip chopping (whether or not to convert single-strip uncompressed
images to mutiple strips of ~8Kb to reduce memory usage) */
@@ -123,5 +162,21 @@
@@ -123,5 +162,23 @@
#define ICC_SUPPORT
#define PHOTOSHOP_SUPPORT
#define IPTC_SUPPORT
+
+#if ! defined( HB_OS_DARWIN )
+#ifndef O_RDONLY
+#define O_RDONLY 0
+#endif
@@ -701,12 +702,13 @@ diff -urN tiff.orig\tiffconf.h tiff\tiffconf.h
+#endif
+#ifndef O_TRUNC
+#define O_TRUNC 001000
+#endif
+#endif
#endif /* _TIFFCONF_ */
diff -urN tiff.orig\tiffio.h tiff\tiffio.h
--- tiff.orig\tiffio.h Sat Sep 29 22:03:18 2012
+++ tiff\tiffio.h Sat Sep 29 22:03:18 2012
--- tiff.orig\tiffio.h Sat Feb 02 20:52:59 2013
+++ tiff\tiffio.h Sat Feb 02 20:52:59 2013
@@ -102,6 +102,8 @@
# else
typedef HFILE thandle_t; /* client data handle */
@@ -717,8 +719,8 @@ diff -urN tiff.orig\tiffio.h tiff\tiffio.h
typedef void* thandle_t; /* client data handle */
#endif /* USE_WIN32_FILEIO */
diff -urN tiff.orig\tiffiop.h tiff\tiffiop.h
--- tiff.orig\tiffiop.h Sat Sep 29 22:03:18 2012
+++ tiff\tiffiop.h Sat Sep 29 22:03:18 2012
--- tiff.orig\tiffiop.h Sat Feb 02 20:52:59 2013
+++ tiff\tiffiop.h Sat Feb 02 20:52:59 2013
@@ -30,7 +30,7 @@
* ``Library-private'' definitions.
*/
@@ -729,8 +731,8 @@ diff -urN tiff.orig\tiffiop.h tiff\tiffiop.h
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
diff -urN tiff.orig\unix.c tiff\unix.c
--- tiff.orig\unix.c Sat Sep 29 22:03:18 2012
+++ tiff\unix.c Sat Sep 29 22:03:18 2012
--- tiff.orig\unix.c Sat Feb 02 20:52:59 2013
+++ tiff\unix.c Sat Feb 02 20:52:59 2013
@@ -29,7 +29,7 @@
* Windows Common RunTime Library.
*/

2
harbour/src/3rd/tiff/tiffconf.h
View File

@@ -163,6 +163,7 @@
#define PHOTOSHOP_SUPPORT
#define IPTC_SUPPORT
#if ! defined( HB_OS_DARWIN )
#ifndef O_RDONLY
#define O_RDONLY 0
#endif
@@ -178,5 +179,6 @@
#ifndef O_TRUNC
#define O_TRUNC 001000
#endif
#endif
#endif /* _TIFFCONF_ */