--- freem/src/symtab_bltin.c	2025/01/19 02:04:04	1.1.1.1
+++ freem/src/symtab_bltin.c	2025/03/24 04:13:11	1.6
@@ -1,23 +1,11 @@
 /*
- *                            *
- *                           * *
- *                          *   *
- *                     ***************
- *                      * *       * *
- *                       *  MUMPS  *
- *                      * *       * *
- *                     ***************
- *                          *   *
- *                           * *
- *                            *
- *
- *   symtab.c
+ *   $Id: symtab_bltin.c,v 1.6 2025/03/24 04:13:11 snw Exp $
  *      FreeM local system table and user-defined special variable table 
  *
  *  
- *   Author: Serena Willis <jpw@coherent-logic.com>
+ *   Author: Serena Willis <snw@coherent-logic.com>
  *    Copyright (C) 1998 MUG Deutschland
- *    Copyright (C) 2020 Coherent Logic Development LLC
+ *    Copyright (C) 2020, 2025 Coherent Logic Development LLC
  *
  *
  *   This file is part of FreeM.
@@ -35,6 +23,19 @@
  *   You should have received a copy of the GNU Affero Public License
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *
+ *   $Log: symtab_bltin.c,v $
+ *   Revision 1.6  2025/03/24 04:13:11  snw
+ *   Replace action macro dat with fra_dat to avoid symbol conflict on OS/2
+ *
+ *   Revision 1.5  2025/03/24 02:01:41  snw
+ *   Work around some OS/2 incompatibilities in symbol table code
+ *
+ *   Revision 1.4  2025/03/09 19:50:47  snw
+ *   Second phase of REUSE compliance and header reformat
+ *
+ *
+ * SPDX-FileCopyrightText:  (C) 2025 Coherent Logic Development LLC
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  **/
 
 #include <stdlib.h>
@@ -57,7 +58,7 @@ symbol-table calls */
 short restoring_consts = FALSE;
 int semid_symtab;
 
-#if !defined(__OpenBSD__) && !defined(__APPLE__)
+#if !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__OS2__)
 union semun {
     int              val;    /* Value for SETVAL */
     struct semid_ds *buf;    /* Buffer for IPC_STAT, IPC_SET */
@@ -94,7 +95,7 @@ long str2long(char *string)
     return value;
 }
 
-void symtab_init ()
+void symtab_init (void)
 {
     register int i;
     union semun arg;
@@ -948,7 +949,7 @@ old0:				/* entry from getinc */
             /* end of set_sym section */
 
             
-            case dat:
+            case fra_dat:
 
 
                 /* note: we assume EOL<DELIM<ASCII */
@@ -2475,12 +2476,11 @@ unsubscr:
 
 
 /******************************************************************************/
-short int collate (s, t)
-    char *s;
-    char *t;
     /* if 't' follows 's' in MUMPS collating sequence a 1 is returned
      * otherwise 0
      */
+
+short int collate (char *s, char *t)
 {
     short dif;
 
@@ -2552,11 +2552,10 @@ short int numeric (char *str)
 }					/* end of numeric() */
 
 /******************************************************************************/
-short int comp (s, t)
-    char *s;
-    char *t;			
     /* s and t are strings representing */
     /* MUMPS numbers. comp returns t>s  */
+
+short int comp (char *s, char *t)
 {
 
     register int s1 = s[0], t1 = t[0], point = '.';
@@ -2621,9 +2620,7 @@ short int comp (s, t)
 
 }					/* end of comp() */
 /******************************************************************************/
-void intstr (str, integ)			/* converts integer to string */
-    char *str;
-    short integ;
+void intstr (char *str, short integ)			/* converts integer to string */
 {
 
     if (integ < 0) {
@@ -2662,9 +2659,7 @@ void intstr (str, integ)			/* converts i
 }					/* end of intstr() */
 
 /******************************************************************************/
-void lintstr (str, integ)			/* converts long integer to string */
-    char *str;
-    long integ;
+void lintstr (char *str, long integ)			/* converts long integer to string */
 {
     char result[11];			/* 32 bit = 10 digits+sign */
     register int i = 0;
@@ -2700,10 +2695,8 @@ void lintstr (str, integ)			/* converts
  * alphabet for each character a pointer to the first variable beginning
  * with that letter is maintained. (0 indicates there's no such var.)
  */
-void udfsvn (action, key, data)		/* symbol table functions */
-    short action;			/* set_sym      get_sym   */
-    char *key;			/* lvn as ASCII-string */
-    char *data;
+
+void udfsvn (short action, char *key, char *data)		/* symbol table functions */
 {
 
 long keyl;			/* length of key                  */
@@ -2910,7 +2903,7 @@ old:
 
 
 /******************************************************************************/
-long getpmore ()
+long getpmore (void)
 {					/* try to get more 'partition' space. returns size increment */
     
     long siz;
@@ -2932,7 +2925,7 @@ long getpmore ()
 }					/* end getpmore */
 
 /******************************************************************************/
-long getumore ()
+long getumore (void)
 {					/* try to get more udfsvntab space. returns size increment */
     long siz, dif;
 
@@ -2958,7 +2951,7 @@ long getumore ()
 }					/* end getumore */
 
 /******************************************************************************/
-long getrmore ()
+long getrmore (void)
 {					/* try to get more routine space. returns size increment */
     long siz, dif;
     short i;
@@ -2990,7 +2983,7 @@ long getrmore ()
 }					/* end getrmore */
 
 /******************************************************************************/
-short int getnewmore ()
+short int getnewmore (void)
 {					/* enlarge new_buffers */
     char *newbuf;
     int i;