fixed compilation with Borland C

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2209 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/as/mcs51/asm.h b/as/mcs51/asm.h
index b66ab5118009f7ce80dd09f456b6b62a693bd70b..8ec9a6193ab8444681b60101608a2add66805520 100644 (file)
--- a/as/mcs51/asm.h
+++ b/as/mcs51/asm.h
@@ -81,7 +81,7 @@
  */
 #include <limits.h>
 #ifndef PATH_MAX               /* POSIX, but not required   */
-#ifdef _MSC_VER                        /* Microsoft C */
+#if defined(_MSC_VER) || defined(__BORLANDC__)  /* Microsoft C or Borland C*/
 #include <stdlib.h>
 #define PATH_MAX       _MAX_PATH
 #else

diff --git a/src/Makefile.bcc b/src/Makefile.bcc
index 36c4179ea47665c90e9d1fa27d83757c7543ab44..01fb56c08011c16041590b3aff07454c9cd7de97 100644 (file)
--- a/src/Makefile.bcc
+++ b/src/Makefile.bcc
@@ -5,8 +5,8 @@ PRJDIR          = ..
 !include ..\Bcc.inc
 CFLAGS  = -I. -I.. -I..\support
 
-PORTS           = mcs51 z80 avr ds390 pic izt
-PORT_LIBS       = mcs51/port.lib z80/port.lib avr/port.lib ds390/port.lib pic/port.lib izt/port.lib
+PORTS           = mcs51 xa51 z80 avr ds390 pic
+PORT_LIBS       = mcs51/port.lib xa51/port.lib z80/port.lib avr/port.lib ds390/port.lib pic/port.lib
 
 #LIBS          = -lgc
 #LIBDIRS               = -L$(PRJDIR)/support/gc
@@ -20,7 +20,7 @@ OBJECTS         = SDCCy.obj SDCClex.obj SDCChasht.obj SDCCmain.obj \
                   SDCCicode.obj SDCCbitv.obj SDCCset.obj SDCClabel.obj \
                   SDCCBBlock.obj SDCCloop.obj SDCCcse.obj SDCCcflow.obj SDCCdflow.obj \
                   SDCClrange.obj SDCCptropt.obj SDCCpeeph.obj SDCCglue.obj \
-                  asm.obj
+                  asm.obj SDCCutil.obj SDCCmacro.obj
 
 SLIBOBJS       = $(SLIB)\SDCCerr.obj $(SLIB)\NewAlloc.obj $(SLIB)\MySystem.obj $(SLIB)\BuildCmd.obj
 

diff --git a/src/pic/Makefile.bcc b/src/pic/Makefile.bcc
index 445fa5ffd383cf9d73b3242bdb7291798b2ccc1d..409e064888aa568a83b9736c8c935cb8fdf9a155 100644 (file)
--- a/src/pic/Makefile.bcc
+++ b/src/pic/Makefile.bcc
@@ -2,7 +2,7 @@ PRJDIR = ../..
 
 # !include $(PRJDIR)/Makefile.common
 
-OBJ = gen.obj genarith.obj ralloc.obj main.obj glue.obj pcode.obj pcodepeep.obj
+OBJ = device.obj gen.obj genarith.obj ralloc.obj main.obj glue.obj pcode.obj pcodeflow.obj pcodepeep.obj pcoderegs.obj
 LIB = port.lib
 
 !include ..\..\Bcc.inc
@@ -13,9 +13,9 @@ all: $(LIB)
 main.obj: main.c peeph.rul
 
 $(LIB): peeph.rul $(OBJ)
-       del $(LIB)
-        tlib /a $(LIB) +gen.obj +genarith.obj +ralloc.obj +main.obj +glue.obj
-        tlib /a $(LIB) +pcode.obj +pcodepeep.obj
+       if exist $(LIB) del $(LIB)
+        tlib /a $(LIB) +device.obj +gen.obj +genarith.obj +ralloc.obj +main.obj +glue.obj
+        tlib /a $(LIB) +pcode.obj +pcodeflow.obj +pcodepeep.obj +pcoderegs.obj
 
 peeph.rul: peeph.def
         gawk -f ../SDCCpeeph.awk peeph.def > peeph.rul

diff --git a/support/cpp2/auto-host_vc_in.h b/support/cpp2/auto-host_vc_in.h
index a31badedfb8ad7785e840cbf8f26aa39f9ab74f1..a2b61ca70845892aa3b4425be16e07f40d577dfc 100644 (file)
--- a/support/cpp2/auto-host_vc_in.h
+++ b/support/cpp2/auto-host_vc_in.h
@@ -42,6 +42,8 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.*/
 #define __STDC__                       1
 
 #define ssize_t int
+
+#ifdef _MSC_VER
 /*So, which ones are the standard types? */
 #define ino_t _ino_t
 #define dev_t _dev_t
@@ -70,5 +72,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.*/
 #pragma warning( disable : 4244 )
 #pragma warning( disable : 4090 )
 #pragma warning( disable : 4022 )
+#endif  _MSC_VER
 
 #endif /*CPP2_VC_H_*/