From cf1e468be705db2cb0be93a9aa28aacdb838550c Mon Sep 17 00:00:00 2001
From: vbwagner <vbwagner>
Date: Fri, 5 Mar 2004 14:06:55 +0000
Subject: hidden unix-specific implementations of file volumes and file
 attributes under #ifndef DJGPP. Added couple of undefs into tclUnixPort.h to
 avoid confilct between Waterloo TCP and DJGPP system error constants

---
 unix/tclUnixFCmd.c | 13 +++++++++++--
 unix/tclUnixPort.h |  9 +++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index fede131..4e2f429 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclUnixFCmd.c,v 1.34 2004/01/29 10:28:23 vincentdarley Exp $
+ * RCS: @(#) $Id: tclUnixFCmd.c,v 1.35 2004/03/05 14:06:55 vbwagner Exp $
  *
  * Portions of this code were derived from NetBSD source code which has
  * the following copyright notice:
@@ -116,6 +116,13 @@ typedef int (TraversalProc) _ANSI_ARGS_((Tcl_DString *srcPtr,
  * and possibly elsewhere in Tcl's core.
  */
 
+#ifdef DJGPP
+
+/*See contrib/djgpp/tclDjgppFCmd.c for definitio*/
+extern TclFileAttrProcs tclpFileAttrProcs[];
+extern char *tclpFileAttrStrings[];
+
+#else
 enum {
     UNIX_GROUP_ATTRIBUTE,
     UNIX_OWNER_ATTRIBUTE,
@@ -161,7 +168,7 @@ CONST TclFileAttrProcs tclpFileAttrProcs[] = {
     {TclMacOSXGetFileAttribute,	TclMacOSXSetFileAttribute},
 #endif
 };
-
+#endif
 /*
  * Declarations for local procedures defined in this file:
  */
@@ -1480,6 +1487,7 @@ SetPermissionsAttribute(interp, objIndex, fileName, attributePtr)
     return TCL_OK;
 }
 
+#ifndef DJGPP
 /*
  *---------------------------------------------------------------------------
  *
@@ -1504,6 +1512,7 @@ TclpObjListVolumes(void)
     Tcl_IncrRefCount(resultPtr);
     return resultPtr;
 }
+#endif
 
 /*
  *----------------------------------------------------------------------
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 3dfd708..55d2512 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -19,7 +19,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclUnixPort.h,v 1.32 2003/12/09 15:27:48 dkf Exp $
+ * RCS: @(#) $Id: tclUnixPort.h,v 1.33 2004/03/05 14:06:55 vbwagner Exp $
  */
 
 #ifndef _TCLUNIXPORT
@@ -135,7 +135,12 @@ EXTERN Tcl_WideUInt	strtoull _ANSI_ARGS_((CONST char *string,
  * Socket support stuff: This likely needs more work to parameterize for
  * each system.
  */
-
+#ifdef DJGPP
+/* ELOOP is defined in both WatTCP includes and DJGPP system includes*/
+#undef ELOOP
+#undef EILSEQ
+#undef EOVERFLOW
+#endif
 #include <sys/socket.h>		/* struct sockaddr, SOCK_STREAM, ... */
 #ifndef NO_UNAME
 #   include <sys/utsname.h>	/* uname system call. */
-- 
cgit v0.12