[Freedos-cvs] SF.net SVN: freedos:[1675] freecom/trunk

[<bar...@us...>]

Revision: 1675
          http://freedos.svn.sourceforge.net/freedos/?rev=1675&view=rev
Author:   bartoldeman
Date:     2011-07-10 13:49:22 +0000 (Sun, 10 Jul 2011)

Log Message:
-----------
Fix Turbo C / debug compilation.

Modified Paths:
--------------
    freecom/trunk/include/misc.h
    freecom/trunk/lib/devopen.c
    freecom/trunk/lib/farread.c
    freecom/trunk/lib/fcompl1.c
    freecom/trunk/lib/fcompl2.c
    freecom/trunk/suppl/src/fputmc.c

Modified: freecom/trunk/include/misc.h
===================================================================
--- freecom/trunk/include/misc.h	2011-07-08 23:23:30 UTC (rev 1674)
+++ freecom/trunk/include/misc.h	2011-07-10 13:49:22 UTC (rev 1675)
@@ -96,8 +96,8 @@
 #endif
 int dos_open(const char *pathname, int flags);
 int dos_creat(const char *pathname, int flags);
+#endif
 int dos_creatnew(const char *pathname, int flags);
-#endif
 #ifndef creatnew
 #define creatnew dos_creatnew
 #endif

Modified: freecom/trunk/lib/devopen.c
===================================================================
--- freecom/trunk/lib/devopen.c	2011-07-08 23:23:30 UTC (rev 1674)
+++ freecom/trunk/lib/devopen.c	2011-07-10 13:49:22 UTC (rev 1675)
@@ -40,6 +40,7 @@
 #include "../config.h"
 #include <io.h>
 #include <fcntl.h>
+#include <dos.h>
 
 #include "../include/openf.h"
 #include "../include/lfnfuncs.h"

Modified: freecom/trunk/lib/farread.c
===================================================================
--- freecom/trunk/lib/farread.c	2011-07-08 23:23:30 UTC (rev 1674)
+++ freecom/trunk/lib/farread.c	2011-07-10 13:49:22 UTC (rev 1675)
@@ -111,6 +111,22 @@
 	return (result == 0 ? handle : -1);
 }
 
+int _read(int fd, void *buf, unsigned int len)
+{
+	return farread(fd, buf, len);
+}
+
+int _write(int fd, const void *buf, unsigned int len)
+{
+	return farwrite(fd, buf, len);
+}
+
+int _close(int fd)
+{
+	return _dos_close(fd);
+}
+#endif
+
 int dos_creatnew(const char *pathname, int attr)
 {
 #ifdef __WATCOMC__
@@ -122,7 +138,7 @@
 
 	r.r_ds = FP_SEG( pathname );
 	r.r_dx = FP_OFF( pathname );
-	r.r_cx = mode;
+	r.r_cx = attr;
 	r.r_ax = 0x5B00;
 
 	intrpt( 0x21, &r );
@@ -132,19 +148,3 @@
 	return( r.r_ax );
 #endif
 }
-
-int _read(int fd, void *buf, unsigned int len)
-{
-	return farread(fd, buf, len);
-}
-
-int _write(int fd, const void *buf, unsigned int len)
-{
-	return farwrite(fd, buf, len);
-}
-
-int _close(int fd)
-{
-	return _dos_close(fd);
-}
-#endif

Modified: freecom/trunk/lib/fcompl1.c
===================================================================
--- freecom/trunk/lib/fcompl1.c	2011-07-08 23:23:30 UTC (rev 1674)
+++ freecom/trunk/lib/fcompl1.c	2011-07-10 13:49:22 UTC (rev 1675)
@@ -47,6 +47,9 @@
 #include <dos.h>
 #include <stdio.h>
 #include <string.h>
+#ifdef __TURBOC__
+#include <dir.h>
+#endif
 
 #include "../include/lfnfuncs.h"
 #undef findfirst

Modified: freecom/trunk/lib/fcompl2.c
===================================================================
--- freecom/trunk/lib/fcompl2.c	2011-07-08 23:23:30 UTC (rev 1674)
+++ freecom/trunk/lib/fcompl2.c	2011-07-10 13:49:22 UTC (rev 1675)
@@ -60,6 +60,9 @@
 #include <dos.h>
 #include <stdio.h>
 #include <string.h>
+#ifdef __TURBOC__
+#include <dir.h>
+#endif
 
 #include "../include/lfnfuncs.h"
 #undef findfirst

Modified: freecom/trunk/suppl/src/fputmc.c
===================================================================
--- freecom/trunk/suppl/src/fputmc.c	2011-07-08 23:23:30 UTC (rev 1674)
+++ freecom/trunk/suppl/src/fputmc.c	2011-07-10 13:49:22 UTC (rev 1675)
@@ -55,10 +55,10 @@
 #endif
 
 int fputmc(int ch, int cnt, FILE *f)
-{	DBG_ENTER("fputmc", Suppl_supplio)
+{	int i;
+	char buf[80];
+	DBG_ENTER("fputmc", Suppl_supplio)
 
-	int i;
-	char buf[80];
 	assert(f);
 
 	DBG_ARGUMENTS( ("ch='%c' (0x%02x), cnt=%u", isprint(ch)? ch: ' ', ch & 0xff, cnt) )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.