[DebianGIS-dev] r2659 - packages/libhdf4/trunk/debian/patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2010-01-18 10:56:20 +0000 (Mon, 18 Jan 2010)
New Revision: 2659

Modified:
   packages/libhdf4/trunk/debian/patches/hdfi.h
Log:
Modified for superH


Modified: packages/libhdf4/trunk/debian/patches/hdfi.h
===================================================================
--- packages/libhdf4/trunk/debian/patches/hdfi.h	2010-01-18 10:24:17 UTC (rev 2658)
+++ packages/libhdf4/trunk/debian/patches/hdfi.h	2010-01-18 10:56:20 UTC (rev 2659)
@@ -1,7 +1,7 @@
-Index: libhdf4-4.2r3/HDF4/hdf/src/hdfi.h
+Index: libhdf4-4.2r4/HDF4/hdf/src/hdfi.h
 ===================================================================
---- libhdf4-4.2r3.orig/HDF4/hdf/src/hdfi.h	2008-06-20 15:22:41.000000000 +0200
-+++ libhdf4-4.2r3/HDF4/hdf/src/hdfi.h	2008-06-20 15:46:09.000000000 +0200
+--- libhdf4-4.2r4.orig/HDF4/hdf/src/hdfi.h	2007-12-19 21:16:09.000000000 +0100
++++ libhdf4-4.2r4/HDF4/hdf/src/hdfi.h	2010-01-18 11:54:42.000000000 +0100
 @@ -48,6 +48,7 @@
  /*      8 - Cray IEEE                                                       */
  /*          (i.e. Big-Endian, all 64-bit architecture w/IEEE Floats)        */
@@ -18,17 +18,18 @@
  #define     DFMT_PC             0x4441
  #define     DFMT_APPLE          0x1111
  #define     DFMT_APPLE_INTEL    0x4441
-@@ -76,6 +78,9 @@
+@@ -76,6 +78,10 @@
  #define     DFMT_IA64           0x4441
  #define     DFMT_LINUX64        0x4441
  #define     DFMT_POWERPC64      0x1111
 +#define     DFMT_ARMV4L         0x4441
 +#define     DFMT_X86_64         0x4441
-+
++#define     DFMT_SH		0x4441
++#define     DFMT_SHEB		0x1111
  
  /* I/O library constants */
  #define UNIXUNBUFIO 1
-@@ -356,7 +361,7 @@
+@@ -356,7 +362,7 @@
  
  #endif /* IBM6000 */
  
@@ -37,7 +38,7 @@
  
  #ifndef HP9000
  #define HP9000
-@@ -419,6 +424,10 @@
+@@ -419,6 +425,10 @@
  /*  what each does */
  #define JMEMSYS         MEM_ANSI
  
@@ -48,7 +49,7 @@
  #endif /* HP9000 */
  
  
-@@ -808,7 +817,7 @@
+@@ -808,7 +818,7 @@
  
  #endif /* __APPLE__ */
  
@@ -57,7 +58,7 @@
  
  #ifndef MIPSEL
  #define MIPSEL
-@@ -1039,6 +1048,340 @@
+@@ -1039,6 +1049,340 @@
  #endif /* INTEL86 */
  #endif /* !(defined(macintosh) || defined(MAC)) */
  
@@ -398,7 +399,7 @@
  #if defined(NEXT) || defined(NeXT)
  
  #ifndef NEXT
-@@ -1185,6 +1528,8 @@
+@@ -1185,6 +1529,8 @@
  #define FILELIB UNIXBUFIO
  #endif
  
@@ -407,7 +408,7 @@
  /* JPEG #define's - Look in the JPEG docs before changing - (Q) */
  
  /* Determine the memory manager we are going to use. Valid values are: */
-@@ -1332,6 +1677,8 @@
+@@ -1332,6 +1678,8 @@
  #define FILELIB UNIXBUFIO
  #endif
  
@@ -416,3 +417,70 @@
  /* JPEG #define's - Look in the JPEG docs before changing - (Q) */
  
  /* Determine the memory manager we are going to use. Valid values are: */
+@@ -1456,6 +1804,66 @@
+ 
+ #endif /* IA64 */
+ 
++/* Renesas SuperH SH3(little/big)/SH4(little/big) */
++#if defined (__linux__) && defined(__sh__)
++
++#ifdef GOT_MACHINE
++If you get an error on this line more than one machine type has been defined.
++Please check your Makefile.
++#endif
++#define GOT_MACHINE 1
++
++#include <fcntl.h>
++#include <sys/types.h>      /* for unbuffered file I/O */
++#include <sys/stat.h>
++#include <unistd.h>
++#include <ctype.h>          /* for character macros */
++
++#if defined (__LITTLE_ENDIAN__)
++#define DF_MT             DFMT_SH
++#elif defined(__BIG_ENDIAN__)
++#define DF_MT		  DFMT_SHEB
++#endif
++
++#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */
++typedef void              VOID;
++#endif  /* end VOID */
++
++typedef void *            VOIDP;
++typedef char *            _fcd;
++typedef char              char8;
++typedef unsigned char     uchar8;
++typedef signed char       int8;
++typedef unsigned char     uint8;
++typedef short int         int16;
++typedef unsigned short int uint16;
++typedef long int          int32;
++typedef unsigned long int uint32;
++typedef int               intn;
++typedef unsigned int      uintn;
++typedef float             float32;
++typedef double            float64;
++typedef long              intf;
++typedef int               hdf_pint_t;
++#define FNAME_POST_UNDERSCORE
++#define _fcdtocp(desc) (desc)
++
++#ifdef  HAVE_FMPOOL
++#define FILELIB PAGEBUFIO  /* enable page buffering */
++#else
++#define FILELIB UNIXBUFIO
++#endif
++
++/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
++/* Determine the memory manager we are going to use. Valid values are: */
++/*  MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS.  See the JPEG docs for details on */
++/*  what each does */
++#define JMEMSYS         MEM_ANSI
++#define HAVE_STDC
++#define INCLUDES_ARE_ANSI
++
++#endif /* Linux/sh */
++
+ #ifndef GOT_MACHINE
+ No machine type has been defined.  Your Makefile needs to have someing like
+ -DSUN or -DUNICOS in order for the HDF internal structures to be defined