Changeset 1241

Timestamp:

Oct 9, 2008, 1:12:04 PM (17 years ago)

Author:

John Small

Message:

Ticket 187: Make searchapath function non-static and other misc. code cleanup

Location:

trunk/dll

Files:

• notebook.h (modified) (1 diff)
• pathutil.h (modified) (1 diff)
• presparm.h (modified) (1 diff)
• srchpath.c (modified) (3 diffs)
• srchpath.h (modified) (2 diffs)

trunk/dll/notebook.h

@@ -17 +17 @@
 #if !defined(NOTEBOOK_H)
 #define NOTEBOOK_H
-
-// #if !defined(OS2_INCLUDED)
-// #define INCL_LONGLONG
-// #include <os2.h>
-// #else
-// #if !defined(INCL_LONGLONG)
-// #error INCL_LONGLONG required by grep.h
-// #endif
-// #endif
 
 #include "dircnrs.h"            // typedef for DETAILS_SETTINGS

trunk/dll/pathutil.h

@@ -20 +20 @@
 #if !defined(OS2_INCLUDED)
 #include <os2.h>
-#else
 #endif
 

trunk/dll/presparm.h

@@ -16 +16 @@
 #define PRESPARM_H
 
-// PMBITMAP_INCLUDED - IBM Toolkit
-// INCL_GPIBITMAPS - OpenWatcom Toolkit
-// #if !defined(PMBITMAP_INCLUDED) && !defined(INCL_GPIBITMAPS)
-// typedef struct _RGB2         /* rgb2 */
-// {
-//   BYTE bBlue;                        /* Blue component of the color definition */
-//   BYTE bGreen;                       /* Green component of the color definition */
-//   BYTE bRed;                 /* Red component of the color definition  */
-//   BYTE fcOptions;            /* Reserved, must be zero                 */
-// }
-// RGB2;
-// typedef RGB2 *PRGB2;
-// #endif
-
 VOID CopyPresParams(HWND target, HWND source);
 VOID PresParamChanged(HWND hwnd, CHAR * keyroot, MPARAM mp1, MPARAM mp2);

trunk/dll/srchpath.c

@@ -12 +12 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   23 Aug 07 SHL Comments
+  04 Oct 08 JBS Make searchapath non-static
 
 ***********************************************************************/
@@ -24 +25 @@
 #include "fm3dlg.h"
 #include "fm3str.h"
+#include "srchpath.h"
 #include "pathutil.h"                   // BldQuotedFileName
 #include "errutil.h"                    // Dos_Error...
-#include "srchpath.h"
 #include "systemf.h"                    // runemf2
 #include "notebook.h"                   // Data declaration(s)
@@ -33 +34 @@
 
 // static CHAR *first_path(CHAR * path, CHAR * ret);
-static CHAR *searchapath(CHAR * path, CHAR * filename);
 
 #pragma data_seg(DATA1)

trunk/dll/srchpath.h

@@ -11 +11 @@
   Change log
 
+  04 Oct 08 JBS Make searchapath function non-static
 ***********************************************************************/
 
@@ -17 +18 @@
 
 INT RunFM2Util(CHAR *appname, CHAR *filename);
+CHAR *searchapath(CHAR * path, CHAR * filename);
 CHAR *searchpath(CHAR * filename);