summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRobert de Bath <rdebath@poboxes.com>1997-10-05 15:05:09 +0200
committerLubomir Rintel <lkundrak@v3.sk>2013-10-23 23:40:02 +0200
commit48798bf2eb93ec3b99720ac2e16093441156653d (patch)
tree35e03d95df5f2677f05e32d70abb6d0583aa47ba /tests
parent9d97bc3cb3aecd3416fb7c4be3ca2f436665b696 (diff)
downloaddev86-48798bf2eb93ec3b99720ac2e16093441156653d.tar.gz
Import Dev86src-0.13.0.tar.gzv0.13.0
Diffstat (limited to 'tests')
-rw-r--r--tests/ft.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/tests/ft.c b/tests/ft.c
index 1bdc737..5bf7a61 100644
--- a/tests/ft.c
+++ b/tests/ft.c
@@ -24,15 +24,19 @@
#include <pwd.h>
#include <grp.h>
-#ifdef S_IFSOCK
-#include <sys/socket.h>
+#if defined(S_IFSOCK) && !defined(__BCC__)
+#defined __HAS_SOCKETS
#endif
#ifndef S_IFLNK
#define lstat stat
#endif
+#ifdef __HAS_SOCKETS
+#include <sys/socket.h>
+#endif
+
/* Ansi prototypes */
-#ifdef __STTDC__
+#ifdef __STDC__
#define PR(x) x
#else
#define PR(x) ()
@@ -106,7 +110,7 @@ struct {
{ "ln", CMD_LN, -1, "vifs" },
{ "mkdir", CMD_MKDIR, 0, "m:" },
{ "mkfifo", CMD_MKFIFO, 0, "m:" },
-#ifdef S_IFSOCK
+#ifdef __HAS_SOCKETS
{ "mksock", CMD_MKSOCK, 0, "m:" },
#endif
{ "mknod", CMD_MKNOD, 4, "m:" },
@@ -505,7 +509,7 @@ int when; char * fname;
case CMD_MKDIR: rv = cmd_mkdir(fname); break;
case CMD_MKFIFO: rv = cmd_mkfifo(fname); break;
-#ifdef S_IFSOCK
+#ifdef __HAS_SOCKETS
case CMD_MKSOCK: rv = cmd_mksock(fname); break;
#endif
case CMD_MKNOD: break;
@@ -721,7 +725,7 @@ static int last_uid=-1, last_gid=-1, last_mode=-1;
{
case S_IFDIR: printf("\td"); break;
case S_IFIFO: printf("\tp"); break;
-#ifdef S_IFSOCK
+#ifdef __HAS_SOCKETS
case S_IFSOCK: printf("\ts"); break;
#endif
case S_IFBLK: printf("\tb,%d,%d", cur_file_stat.st_rdev>>8,
@@ -756,7 +760,7 @@ char * fname;
return rv;
}
-#ifdef S_IFSOCK
+#ifdef __HAS_SOCKETS
int
cmd_mksock(fname)
char * fname;