[svn-r1691] Portability tweaks and warnings fixed

This commit is contained in:
Quincey Koziol 1999-09-28 19:31:07 -05:00
parent 523f5cebb2
commit 21b0e20bf7
5 changed files with 16 additions and 4 deletions

View File

@ -1160,7 +1160,8 @@ size_t mdims[2];
static void test_str2(void) {
hid_t fid, group, attr, dataset, space, space2, mem_space, hyper_space;
hid_t fxdlenstr, fxdlenstr2, memtype;
hsize_t dims[1], size[1], start[1], stride[1], count[1], block[1];
hsize_t dims[1], size[1], stride[1], count[1], block[1];
hssize_t start[1];
int i;

View File

@ -25,8 +25,12 @@
#define H5DUMP_BUFSIZE (1024)
#endif
#ifndef MIN
#define MIN(X,Y) ((X)<(Y)?(X):(Y))
#endif
#ifndef NELMTS
#define NELMTS(X) (sizeof(X)/sizeof(*X))
#endif
#define ALIGN(A,Z) ((((A)+(Z)-1)/(Z))*(Z))

View File

@ -32,13 +32,21 @@
# include <sys/stat.h>
#endif
#ifndef FALSE
#define FALSE 0
#endif
#ifndef TRUE
#define TRUE 1
#endif
#define NAMELEN 4096
#define GB *1024*1024*1024
#ifndef MIN
#define MIN(X,Y) ((X)<(Y)?(X):(Y))
#endif
#ifndef MIN3
#define MIN3(X,Y,Z) MIN(MIN(X,Y),Z)
#endif
/*-------------------------------------------------------------------------

View File

@ -11,11 +11,10 @@
*****************************************************************************/
#include <stdio.h>
#include "h5toh4.h"
#include <errno.h>
#include <string.h>
#include <fcntl.h>
#include <h5toh4.h>
extern int PrintOptions_h5toh4(void);
extern char *BuildFilename(char *h5_filename, char *h4_extension);

View File

@ -1,8 +1,8 @@
#ifndef _H5TOH4_H
#define _H5TOH4_H
#include <hdf5.h>
#include <mfhdf.h>
#include <hdf5.h>
/*
* Copyright © 1998 NCSA