aboutsummaryrefslogtreecommitdiffstats
path: root/extension/readdir.c
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2015-10-04 11:22:56 +0300
committerArnold D. Robbins <arnold@skeeve.com>2015-10-04 11:22:56 +0300
commit2626d04d332dd87d4e6e9effe943dd6aa3d21cac (patch)
tree705737cb3eda7b80afaec1c0b22c620491e212e0 /extension/readdir.c
parentb08964cd1db8da56e2a16cebde05d493d4f6ae1b (diff)
parentd992c45de5c007fc28a8e0cafec81bb9308a342c (diff)
downloadegawk-2626d04d332dd87d4e6e9effe943dd6aa3d21cac.tar.gz
egawk-2626d04d332dd87d4e6e9effe943dd6aa3d21cac.tar.bz2
egawk-2626d04d332dd87d4e6e9effe943dd6aa3d21cac.zip
Merge branch 'gawk-4.1-stable' (zOS updates included)
Diffstat (limited to 'extension/readdir.c')
-rw-r--r--extension/readdir.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/extension/readdir.c b/extension/readdir.c
index 7bcabcb0..4578b864 100644
--- a/extension/readdir.c
+++ b/extension/readdir.c
@@ -137,11 +137,7 @@ ftype(struct dirent *entry, const char *dirname)
}
/* get_inode --- get the inode of a file */
-#ifdef ZOS_USS
-static long
-#else
static long long
-#endif
get_inode(struct dirent *entry, const char *dirname)
{
#ifdef __MINGW32__
@@ -179,11 +175,7 @@ dir_get_record(char **out, awk_input_buf_t *iobuf, int *errcode,
int len;
open_directory_t *the_dir;
const char *ftstr;
-#ifdef ZOS_USS
- unsigned long ino;
-#else
unsigned long long ino;
-#endif
/*
* The caller sets *errcode to 0, so we should set it only if an
@@ -208,9 +200,7 @@ dir_get_record(char **out, awk_input_buf_t *iobuf, int *errcode,
ino = get_inode (dirent, iobuf->name);
-#if defined(ZOS_USS)
- len = sprintf(the_dir->buf, "%lu/%s", ino, dirent->d_name);
-#elif __MINGW32__
+#if __MINGW32__
len = sprintf(the_dir->buf, "%I64u/%s", ino, dirent->d_name);
#else
len = sprintf(the_dir->buf, "%llu/%s", ino, dirent->d_name);