--- freem/src/mpsdef.h	2025/03/09 19:50:47	1.4
+++ freem/src/mpsdef.h	2025/04/13 04:22:43	1.9
@@ -1,5 +1,5 @@
 /*
- *   $Id: mpsdef.h,v 1.4 2025/03/09 19:50:47 snw Exp $
+ *   $Id: mpsdef.h,v 1.9 2025/04/13 04:22:43 snw Exp $
  *    common external definitions for all mumps modules
  *
  *  
@@ -24,6 +24,21 @@
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *
  *   $Log: mpsdef.h,v $
+ *   Revision 1.9  2025/04/13 04:22:43  snw
+ *   Fix snprintf calls
+ *
+ *   Revision 1.8  2025/04/10 01:24:38  snw
+ *   Remove C++ style comments
+ *
+ *   Revision 1.7  2025/04/04 19:43:18  snw
+ *   Switch to using environment catalog to determine user and group for environment, and remove -u and -g flags from freem
+ *
+ *   Revision 1.6  2025/04/02 03:02:42  snw
+ *   Stop requiring users to pass -e to fmadm when -u or -g are passed
+ *
+ *   Revision 1.5  2025/03/24 04:05:36  snw
+ *   Replace crlf with frm_crlf to avoid symbol conflict with readline on OS/2
+ *
  *   Revision 1.4  2025/03/09 19:50:47  snw
  *   Second phase of REUSE compliance and header reformat
  *
@@ -162,7 +177,7 @@ extern short nakoffs;			/* offset to nak
 extern char zfunkey[44][FUNLEN];	/* $ZF function key */
 extern short xpos[MAXDEV + 1];		/* $X-vector */
 extern short ypos[MAXDEV + 1];		/* $Y-vector */
-extern short crlf[MAXDEV + 1];		/* CR/LF flag vector               */
+extern short frm_crlf[MAXDEV + 1];		/* CR/LF flag vector               */
 extern short fm_nodelay[MAXDEV + 1];	/* nodelay flag vector             */
 extern int SIflag[MAXDEV + 1];		/* SI/SO flag                      */
 extern int ESCflag[MAXDEV + 1];		/* ESC flag                        */
@@ -241,6 +256,7 @@ extern int noclear;
 extern int standard;			/* 1=standard only,               */
 extern int quiet_mode;                  /* quiet mode                     */
 extern char config_file[4096];          /* path to configuration file */
+extern char env_config_file[4096];  /* path to environment config file */
 extern char shm_env[255];               /* shared memory environment       */
 					/* 0=non standard features enabled */
 extern short ierr;
@@ -320,10 +336,6 @@ extern char oucpath[PATHLEN];		/* OPEN/U
 extern char rgafile[PATHLEN];		/* routine/global access protocol file */
 extern char zargdefname[PATHLEN];	/* default varname for Zcommands */
 extern FILE *rgaccess;			/* dto. filedes */
-extern char locktab[PATHLEN];		/* file with LOCKs */
-extern char zallotab[PATHLEN];		/* file with ZALLOCATE */
-extern char hcpyfile[PATHLEN];		/* hardcopy file */
-extern char jourfile[PATHLEN];		/* journal file */
 extern FILE *jouraccess;		/* dto. filedes */
 
 extern char curdir[PATHLEN];			/* current directory */
@@ -379,7 +391,7 @@ extern short direct_mode;
 extern short loadsw;			/* flag to avoid redundant loads */
 extern short extr_types[NESTLEVLS + 1]; /* return types of extrinsic functions */
 
-extern char destructors[10][50];
+extern char destructors[10][OBJ_DSTRSIZE];
 extern int destructor_ct;
 extern char private_keys[MAX_PRIVATE_KEYS][255];
 
@@ -398,7 +410,6 @@ extern short timeoutms;
 extern char tmp4[80];
 extern short param;			/* parameter count */
 extern short paramx;			/* current parameter */
-//extern char *calloc ();
 extern short level;			/* level count */
 extern short nestlt[NESTLEVLS + 1];	/* stack $T / stack levelcount */
 extern pid_t pid;			/* $J = process ID */
@@ -418,9 +429,6 @@ extern short first_process;
 extern size_t shm_init_size;
 extern short inrpt_after_async;
 
-//#ifndef OLDUNIX
-// extern struct sigaction act;		/* signals stuff */
-//#endif /* OLDUNIX */
 
 /* Macros */
 /* Create a new variable of type (datatype) with space for qty instances */