Changeset 1890 for trunk/dll

Timestamp:

Jan 30, 2020, 7:39:42 AM (6 years ago)

Author:

Steven Levine

Message:

Add PMPRINTF enable support to makefiles.
Correct PMPRINTF debug macro enables in sources.

Location:

trunk/dll

Files:

• dircnrs.c (modified) (1 diff)
• filldir.c (modified) (1 diff)
• flesh.c (modified) (2 diffs)
• makefile (modified) (5 diffs)
• misc.c (modified) (1 diff)
• select.c (modified) (1 diff)
• sortcnr.c (modified) (1 diff)
• update.c (modified) (1 diff)
• valid.c (modified) (1 diff)

trunk/dll/dircnrs.c

@@ -174 +174 @@
 #include "pathutil.h"                   // AddBackslashToPath
 #include "copyf.h"                      // ignorereadonly
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif

trunk/dll/filldir.c

@@ -168 +168 @@
 #include "pathutil.h"                   // AddBackslashToPath
 #include "tmrsvcs.h"                    // ITIMER_DESC
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif

trunk/dll/flesh.c

@@ -79 +79 @@
 #include "common.h"                     // IncrThreadUsage DecrThreadUsage
 #include "pathutil.h"
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif
@@ -88 +89 @@
 
 static PSZ pszSrcFile = __FILE__;
-
 
 static INT tidFleshWorkListThread = -1; // 2015-08-08 SHL

trunk/dll/makefile

@@ -3 +3 @@
 
 # Copyright (c) 1993-98 M. Kimes
-# Copyright (c) 2002, 2015 Steven H. Levine
+# Copyright (c) 2002-2020 Steven H. Levine
 
 # 22 May 03 SHL Correct icon dependencies
@@ -48 +48 @@
 # 24 Feb 14 JBS Ticket #500: Suspended use of high memory by commenting out the calls to exehdr
 # 13 Aug 15 SHL Add listutil
+# 25 Jan 20 SHL Add PMPRINTF support
 
 # Environment: see makefile_pre.mk and makefile_post.mk
@@ -54 +55 @@
 # WARNALL - add more warnings if defined, standard warnings if not defined
 # FORTIFY - enable FORTIFY heap checking if defined, omit FORITY support if not defined
+# PMPRINTF - enable PMPRINTF support, omit PMPRINTF support if not defined
 # USE_RC - use rc.exe if defined, use wrc.exe if not defined
 # NOHIGHMEM - support high memory use (i.e exehdir /highmem)
+
+# PMPRINTF support assumes PMPRINTF.H in INCLUDE path
+# PMPRINTF support assumes PMPRINTF.LIB in LIB path
 
 BASE = fm3dll
@@ -159 +164 @@
 !endif
 
+!ifdef PMPRINTF
+CFLAGS += -dPMPRINTF
+!endif
+
 # for fm3res only
 CFLAGSR = -bt=os2 -mf -bd -bm         -olirs -s     -j -we -wx -zfp -zgp -zp4 -zq
@@ -362 +371 @@
   -del *~
 
+# eof

trunk/dll/misc.c

@@ -122 +122 @@
 #include "fortify.h"
 #include "info.h"                       // driveflags
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif

trunk/dll/select.c

@@ -74 +74 @@
 #include "flesh.h"
 #include "treecnr.h"                    // fExpandAll
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif

trunk/dll/sortcnr.c

@@ -28 +28 @@
 #include "sortcnr.h"
 #include "valid.h"                      // TestCDates
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif

trunk/dll/update.c

@@ -51 +51 @@
 #include "misc.h"                       // PostMsg
 #include "fortify.h"
-#if 0
-#define  __PMPRINTF__
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
 #include "PMPRINTF.H"
 #endif

trunk/dll/valid.c

@@ -696 +696 @@
       }
     }
-     else if (*argv[x] == '`' && isalpha(argv[x][1])) {
+    else if (*argv[x] == '`' && isalpha(argv[x][1])) {
 
       CHAR *p = &argv[x][1];