[svn-r7641] Purpose:

    Code cleanup

Description:
    Start stripping leftovers from HDF4 out of this file, working toward
getting everything defined at configure time, instead of depending on the
framework of ifdef's used in HDF4.

Platforms tested:
    h5committest

1 files changed, 3 insertions, 169 deletions

diff --git a/fortran/src/H5f90i.h b/fortran/src/H5f90i.h
index c782088..6ded761 100644
--- a/fortran/src/H5f90i.h
+++ b/fortran/src/H5f90i.h
@@ -16,41 +16,16 @@
 #ifndef _H5f90i_H
 #define _H5f90i_H
 
-#ifdef GOT_MACHINE
-#undef GOT_MACHINE
-#endif
-
-#define  DFMT_IRIX         0x1111
-
 /* 
  * Standard header files needed all the time 
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <string.h>
 #include "H5private.h"
 
 #if (defined (UNICOS) || (defined (_UNICOS)))
 
-#ifndef UNICOS 
-#define UNICOS 
-#endif
-
-#include <memory.h>
 #include <fortran.h>
-#ifndef O_RDONLY
-#include <fcntl.h>              /* for unbuffered i/o stuff */
-#define L_INCR  1
-#include <sys/stat.h>
-#endif /*O_RDONLY*/
-
-#ifdef _CRAYIEEE
-#define DF_MT   DFMT_UNICOSIEEE
-#else
-#define DF_MT   DFMT_UNICOS
-#endif
+
 /*typedef char*              _fcd;*/
 typedef long               hsize_t_f;
 typedef long               hssize_t_f;
@@ -65,24 +40,6 @@ typedef double             real_f;
 
 #if defined(IBM6000) || defined(_AIX)
 
-#ifndef IBM6000
-#define IBM6000
-#endif
-
-#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
-
-#   define BSD
-
-#ifndef __GNUC__
-#include <memory.h>
-#endif /* __GNUC__ */
-#include <sys/file.h>               /* for unbuffered i/o stuff */
-#include <sys/stat.h>
-#define DF_MT             DFMT_IBM6000
 typedef char              *_fcd;
 typedef long long         hsize_t_f;
 typedef long long         hssize_t_f;
@@ -96,7 +53,6 @@ typedef float             real_f;
 /* LINUX definitions */
 #if (defined(i386) || defined(__i386__)) && (defined(linux) || defined(__linux__))
 
-#define DF_MT             DFMT_LINIX
 typedef char              *_fcd;
 typedef long long         hsize_t_f;
 typedef long long         hssize_t_f;
@@ -104,12 +60,11 @@ typedef int               size_t_f;
 typedef int               int_f;
 typedef int               hid_t_f;
 typedef float             real_f;
-#define FNAME_POST_UNDERSCORE
 #if defined H5_ABSOFT
 #define DF_CAPFNAMES
-#define FNAME(x) x
+#else
+#define FNAME_POST_UNDERSCORE
 #endif /*H5_ABSOFT*/
-
 #define _fcdtocp(desc) (desc)
 
 #endif /*LINUX*/
@@ -131,33 +86,7 @@ typedef float             real_f;
 
 #if defined(IRIX) || defined(IRIS4) || defined(sgi) || defined(__sgi__) || defined(__sgi)
 
-#ifndef IRIX
-#define IRIX
-#endif
-
-#if (_MIPS_SZLONG == 64)
-/* IRIX 64 bits objects.  It is nearly the same as the conventional
- * 32 bits objects.  Let them share IRIX definitions for now.
- */
-#define IRIX64
-#endif
-
-
-#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
-
-#   define BSD
-#ifndef __GNUC__
-#include <memory.h>
-#endif /* __GNUC__ */
-#include <sys/file.h>               /* for unbuffered i/o stuff */
-#include <sys/stat.h>
-#define DF_MT         DFMT_IRIX
 typedef char          *_fcd;
-
 typedef long          hsize_t_f;
 typedef long          hssize_t_f;
 typedef long          size_t_f;
@@ -166,37 +95,10 @@ typedef int           hid_t_f;
 typedef float         real_f;
 #define FNAME_POST_UNDERSCORE
 #define _fcdtocp(desc) (desc)
-#ifdef IRIX64
-#define BIG_LONGS
-#endif
 #endif /* IRIX */
 
 #if (defined(SUN) || defined(sun) || defined(__sun__) || defined(__SUNPRO_C)) & !defined(__i386)
 
-#ifdef __STDC__
-#define ANSISUN
-#else /* __STDC__ */
-#define KNRSUN
-#endif /* __STDC__ */
-#endif /* SUN || sun */
-
-#if defined(ANSISUN)
-
-#if !defined(SUN)
-#define SUN
-#endif
-
-#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
-
-#include <unistd.h>                 /* for some file I/O stuff */
-#include <sys/time.h>
-#include <sys/file.h>               /* for unbuffered i/o stuff */
-#include <sys/stat.h>
-#define DF_MT             DFMT_SUN
 typedef char              *_fcd;
 typedef long long         hssize_t_f;
 typedef long long         hsize_t_f;
@@ -211,18 +113,6 @@ typedef float             real_f;
 
 #if defined DEC_ALPHA || (defined __alpha && defined __unix__ && !defined __linux__)
 
-#ifndef DEC_ALPHA
-#define DEC_ALPHA
-#endif
-
-#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
-#include <sys/file.h>               /* for unbuffered i/o stuff */
-#include <sys/stat.h>
-#define DF_MT            DFMT_ALPHA
 typedef char             *_fcd;
 typedef long             hsize_t_f;
 typedef long             hssize_t_f;
@@ -237,19 +127,6 @@ typedef float            real_f;
 
 #if defined __alpha__ && defined __linux__
 
-#ifndef DEC_ALPHA_LINUX
-#define DEC_ALPHA_LINUX
-#endif
-
-#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
-
-#include <sys/file.h>               /* for unbuffered i/o stuff */
-#include <sys/stat.h>
-#define DF_MT            DFMT_ALPHA
 typedef char             *_fcd;
 typedef long long            hsize_t_f;
 typedef long long            hssize_t_f;
@@ -264,23 +141,6 @@ typedef float            real_f;
 
 #if defined(HP9000) || (!defined(__convexc__) && (defined(hpux) || defined(__hpux)))
 
-#ifndef HP9000
-#define HP9000
-#endif
-
-#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
-
-#   define BSD
-#ifndef __GNUC__
-#include <memory.h>
-#endif /* __GNUC__ */
-#include <sys/file.h>               /* for unbuffered i/o stuff */
-#include <sys/stat.h>
-#define DF_MT          DFMT_HP9000
 typedef char           *_fcd;
 typedef long long           hsize_t_f;
 typedef long long          hssize_t_f;
@@ -295,22 +155,6 @@ typedef float          real_f;
 
 #if defined _WINDOWS || defined WIN32
 
-#define GOT_MACHINE 1
-
-#pragma comment( lib, "oldnames" )
-#include <fcntl.h>
-#include <sys\types.h>
-#include <sys\stat.h>
-#include <io.h>
-#include <conio.h> 
-#include <malloc.h>
-#include <ctype.h>          /* for character macros */
-#ifdef __WATCOMC__
-#include <stddef.h>         /* for the 'fortran' pragma */
-#endif
-
-#define DF_MT             DFMT_PC
-
 typedef char              *_fcd;
 typedef int               hsize_t_f;
 typedef int               hssize_t_f;
@@ -319,10 +163,6 @@ typedef int               int_f;
 typedef int               hid_t_f;
 typedef float             real_f;
 
-#if defined _M_ALPHA
-#define FNAME_PRE_UNDERSCORE
-#endif
-
 #define DF_CAPFNAMES
 #define _fcdtocp(desc) (desc)
 
@@ -351,11 +191,5 @@ typedef float             real_f;
 #if !defined(FNAME_PRE_UNDERSCORE) && defined(FNAME_POST2_UNDERSCORE)
 #   define FNAME(x)     x##__
 #endif
-/*
-#  define HDfree(p)        (free((void*)p))
-#  define HDmalloc(s)      (malloc((size_t)s))
-#  define HDstrlen(s)       (strlen((const char *)(s))) 
-#  define HDmemcpy(dst,src,n)   (memcpy((void *)(dst),(const void *)(src),(size_t)(n)))
-*/
 
 #endif /* _H5f90i_H */