Changeset 9707 for trunk/include

Timestamp:

Jan 22, 2003, 6:05:19 PM (23 years ago)

Author:

sandervl

Message:

Added changed VAC headers to rename memory and file functions; add include\incl_vac to include path (/I)

Location:

trunk/include

Files:

• dbglog.h (modified) (2 diffs)
• incl_vac (added)
• incl_vac/MALLOC.H (added)
• incl_vac/STDIO.H (added)
• incl_vac/STDLIB.H (added)
• incl_vac/UMALLOC.H (added)
• odin32.dbg.vac3.mk (modified) (2 diffs)
• odin32.dbg.vac36.mk (modified) (2 diffs)
• odin32.profile.vac3.mk (modified) (3 diffs)
• odin32.profile.vac36.mk (modified) (2 diffs)
• odin32.rel.vac3.mk (modified) (2 diffs)
• odin32.rel.vac36.mk (modified) (2 diffs)
• win/debugtools.h (modified) (2 diffs)

trunk/include/dbglog.h

@@ -31 +31 @@
   #define dprintfNoEOL(a)      WriteLogNoEOL a
 #endif
-  #define eprintf(a)      WriteLog a ; WriteLogError a
-  #define dassert(a, b)   if(!(a)) WriteLogError b
+  #define eprintf(a)      WriteLog a 
+  #define dassert(a, b)   if(!(a)) dprintf b
   #define dbgCheckObj(a)        a->checkObject()
   #define DisableLogging()  DecreaseLogCount()
@@ -80 +80 @@
 int  SYSTEM WriteLogNoEOL(char *tekst, ...);
 int  SYSTEM WritePrivateLog(void *logfile, char *tekst, ...);
-
-int  SYSTEM WriteLogError(char *tekst, ...);
 
 void SYSTEM DecreaseLogCount();

trunk/include/odin32.dbg.vac3.mk

@@ -1 @@
-# $Id: odin32.dbg.vac3.mk,v 1.10 2002-04-11 22:42:38 bird Exp $
+# $Id: odin32.dbg.vac3.mk,v 1.11 2003-01-22 17:05:17 sandervl Exp $
 
 #
@@ -70 +70 @@
 CFLAGS_WIN32APP  = -c -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(PROFILEFLAGS) $(CTARGETFLAGS)
 CXXFLAGS_WIN32APP= -c -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(PROFILEFLAGS) $(CXXTARGETFLAGS)
-CINCLUDES        = -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
+CINCLUDES        = -I$(ODIN32_INCLUDE)\incl_vac -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE) 
 CDEFINES_WIN32APP= -DDEBUG -D__WIN32OS2__ -D__i386__
 CDEFINES_ODINCRT = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__

trunk/include/odin32.dbg.vac36.mk

@@ -1 @@
-# $Id: odin32.dbg.vac36.mk,v 1.7 2002-02-23 23:51:49 bird Exp $
+# $Id: odin32.dbg.vac36.mk,v 1.8 2003-01-22 17:05:17 sandervl Exp $
 
 #
@@ -67 +67 @@
 CFLAGS_WIN32APP  = -c -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(CTARGETFLAGS)
 CXXFLAGS_WIN32APP= -c -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(CXXTARGETFLAGS)
-CINCLUDES        = -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
+CINCLUDES        = -I$(ODIN32_INCLUDE)\incl_vac -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE) 
 CDEFINES_WIN32APP= -DDEBUG -D__WIN32OS2__ -D__i386__
 CDEFINES_ODINCRT = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__

trunk/include/odin32.profile.vac3.mk

@@ -1 @@
-# $Id: odin32.profile.vac3.mk,v 1.13 2002-04-17 04:06:24 bird Exp $
+# $Id: odin32.profile.vac3.mk,v 1.14 2003-01-22 17:05:17 sandervl Exp $
 
 #
@@ -19 +19 @@
 LIB_DEMANGLE = demangl.lib
 !ifndef DEBUG
-#OBJ_PROFILE = $(ODIN32_LIB)\cppopa3.obj $(ODIN32_LIB)\cppopa3_fix2.obj
-OBJ_PROFILE = $(ODIN32_LIB)\cpppan40.obj
+OBJ_PROFILE = $(ODIN32_LIB)\cppopa3.obj $(ODIN32_LIB)\cppopa3_fix2.obj
 NO_LXLITE = 1
 !endif
@@ -82 +81 @@
 CFLAGS_WIN32APP  = -c -Q -Si -G5 -O- -Oi- -Ss+ -W3 -Gm+ /Gn+ -Ti+ $(PROFILEFLAGS) $(CTARGETFLAGS)
 CXXFLAGS_WIN32APP= -c -Q -Si -G5 -O- -Oi- -Ss+ -W3 -Gm+ /Gn+ -Ti+ $(PROFILEFLAGS) $(CXXTARGETFLAGS)
-CINCLUDES        = -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
+CINCLUDES        = -I$(ODIN32_INCLUDE)\incl_vac -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE) 
 CDEFINES         = -D__WIN32OS2__ -D__WINE__ -D__i386__ -DTCPV40HDRS -DCOMCTL32UNDOC
 CDEFINES_ODINCRT = -D__WIN32OS2__ -D__WINE__ -D__i386__

trunk/include/odin32.profile.vac36.mk

@@ -1 @@
-# $Id: odin32.profile.vac36.mk,v 1.5 2002-02-23 23:51:49 bird Exp $
+# $Id: odin32.profile.vac36.mk,v 1.6 2003-01-22 17:05:17 sandervl Exp $
 
 #
@@ -67 +67 @@
 CFLAGS_WIN32APP  = -c -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(CTARGETFLAGS)
 CXXFLAGS_WIN32APP= -c -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(CXXTARGETFLAGS)
-CINCLUDES        = -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
+CINCLUDES        = -I$(ODIN32_INCLUDE)\incl_vac -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE) 
 CDEFINES_WIN32APP= -DDEBUG -DPROFILE -D__WIN32OS2__ -D__i386__
 CDEFINES_ODINCRT = -DDEBUG -DPROFILE -D__WIN32OS2__ -D__i386__ -D__WINE__

trunk/include/odin32.rel.vac3.mk

@@ -1 @@
-# $Id: odin32.rel.vac3.mk,v 1.10 2002-04-11 22:46:49 bird Exp $
+# $Id: odin32.rel.vac3.mk,v 1.11 2003-01-22 17:05:18 sandervl Exp $
 
 #
@@ -70 +70 @@
 CFLAGS_WIN32APP  = -c -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn+ $(PROFILEFLAGS) $(CTARGETFLAGS)
 CXXFLAGS_WIN32APP= -c -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn+ $(PROFILEFLAGS) $(CXXTARGETFLAGS)
-CINCLUDES        = -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
+CINCLUDES        = -I$(ODIN32_INCLUDE)\incl_vac -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE) 
 CDEFINES         = -D__WIN32OS2__ -D__WINE__ -D__i386__ -DTCPV40HDRS -DCOMCTL32UNDOC
 CDEFINES_ODINCRT = -D__WIN32OS2__ -D__WINE__ -D__i386__

trunk/include/odin32.rel.vac36.mk

@@ -1 @@
-# $Id: odin32.rel.vac36.mk,v 1.7 2002-02-23 23:51:50 bird Exp $
+# $Id: odin32.rel.vac36.mk,v 1.8 2003-01-22 17:05:18 sandervl Exp $
 
 #
@@ -66 +66 @@
 CFLAGS_WIN32APP  = -c -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn+ $(CTARGETFLAGS)
 CXXFLAGS_WIN32APP= -c -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn+ $(CXXTARGETFLAGS)
-CINCLUDES        = -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
+CINCLUDES        = -I$(ODIN32_INCLUDE)\incl_vac -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE) 
 CDEFINES         = -D__WIN32OS2__ -D__WINE__ -D__i386__ -DTCPV40HDRS -DCOMCTL32UNDOC
 CDEFINES_ODINCRT = -D__WIN32OS2__ -D__WINE__ -D__i386__

trunk/include/win/debugtools.h

@@ -23 +23 @@
   #define dprintf(a)      WriteLog a
 #endif
-  #define eprintf(a)      WriteLog a ; WriteLogError a
-  #define dassert(a, b)   if(!(a)) WriteLogError b
+  #define eprintf(a)      WriteLog a 
+  #define dassert(a, b)   if(!(a)) dprintf b
   #define dbgCheckObj(a)   a->checkObject()
 
@@ -48 +48 @@
 int  SYSTEM WriteLog(char *tekst, ...);
 int  SYSTEM WritePrivateLog(void *logfile, char *tekst, ...);
-int  SYSTEM WriteLogError(char *tekst, ...);
 
 void SYSTEM DecreaseLogCount();