Commit c4aee9a8 authored by bonnell's avatar bonnell
Browse files

Fix windows compile errors.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23672 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5ec9cd70
......@@ -4758,6 +4758,7 @@ int chk_gmvend(FILE *fin)
int i, chkend;
long int currpos;
char rdend[21];
size_t res;
/* Get the current file position. */
/* currpos = ftell(fin); */
......@@ -4765,7 +4766,7 @@ int chk_gmvend(FILE *fin)
/* Read the last 20 characters of the file. */
fseek(fin, -20L, 2);
size_t res = fread(rdend,sizeof(char), 20, fin); (void) res;
res = fread(rdend,sizeof(char), 20, fin); (void) res;
/* Check the 20 characters for endgmv. */
chkend = 0;
......@@ -7032,6 +7033,7 @@ int chk_rayend(FILE *fin)
int i, chkend;
long int currpos;
char rdend[21];
size_t res;
/* Get the current file position. */
/* currpos = ftell(fin); */
......@@ -7039,7 +7041,7 @@ int chk_rayend(FILE *fin)
/* Read the last 20 characters of the file. */
fseek(fin, -20L, 2);
size_t res = fread(rdend,sizeof(char), 20, fin); (void) res;
res = fread(rdend,sizeof(char), 20, fin); (void) res;
/* Check the 20 characters for endray. */
chkend = 0;
......
......@@ -72,6 +72,7 @@ using namespace std;
#define LSEEK64 ::_lseeki64
#define READ ::_read
#define WRITE ::_write
#define ssize_t int
#else
#include <unistd.h>
......
......@@ -282,7 +282,11 @@ int extract_or_test_files(__G) /* return PK-type error code */
unsigned members_processed;
ulg num_skipped=0L, num_bad_pwd=0L;
LONGINT old_extra_bytes = 0L;
#ifdef WIN32
int res = 0;
#else
ssize_t res = 0;
#endif
#ifdef SET_DIR_ATTRIB
unsigned num_dirs=0;
dirtime *dirlist=(dirtime *)NULL, **sorted_dirlist=(dirtime **)NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment