Merge branch 'master' into dtdocbook

cde/include/Dt/Dt.h.in

@@ -50,15 +50,15 @@ extern "C" {
 
 /* CDE Version information */
 
-#define DtVERSION     		2
-#define DtREVISION    		4
-#define DtUPDATE_LEVEL    	0
+#define DtVERSION     		@CDE_VERSION_MAJOR@
+#define DtREVISION    		@CDE_VERSION_MINOR@
+#define DtUPDATE_LEVEL    	@CDE_VERSION_MICRO@
 
 #define DtVERSION_NUMBER	(DtVERSION * 10000 +  \
 				DtREVISION * 100 + \
 				DtUPDATE_LEVEL)
 
-#define DtVERSION_STRING "CDE Version 2.4.0a"
+#define DtVERSION_STRING "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
 
 
 /* 

cde/include/Dt/SearchP.h

@@ -517,27 +517,23 @@ struct or_hwordrec {
  * Actual host_to_network functions defined in <netinit/in.h>
  * which is not yet standardized.
  */
+
+/* JET - Update 12/21/2021 - no need to define (or not) BYTE_SWAP
+ * anymore as we can determine that via autotools (for the code).
+ * Elsewhere, we can just use the systems hto*()/nto*() routines
+ * regardless.
+ */
+
 typedef enum {HTON=1, NTOH} SWABDIR;
 
 extern void swab_dbrec  (struct or_dbrec  *rec,  SWABDIR direction);
 extern void swab_objrec (struct or_objrec *rec,  SWABDIR direction);
 
-#ifdef BYTE_SWAP	/* ie (BYTE_ORDER != BIG_ENDIAN) */
-
 #define HTONL(x)	x = htonl(x)
 #define HTONS(x)	x = htons(x)
 #define NTOHL(x)	x = ntohl(x)
 #define NTOHS(x)	x = ntohs(x)
 
-#else	/* !BYTE_SWAP, ie (BYTE_ORDER == BIG_ENDIAN) */
-
-#define HTONL(x)
-#define HTONS(x)
-#define NTOHL(x)
-#define NTOHS(x)
-
-#endif /* BYTE_SWAP */
-
 
 /*--------------- TESKEY PARSE CHARACTER TYPES ------------
  * Used in langmap.c for linguistic parsing modules.

cde/include/EUSCompat.h

@@ -52,8 +52,12 @@ extern "C" {
 ** System V R4 based systems define the stuff we need in
 ** sys/types.h. Include that and then we are done.
 */
-#if defined(HPUX) || defined(__linux__) || defined(SunOS)
-#include <sys/types.h>
+#if defined(HPUX) || defined(__linux__) || defined(SunOS) || defined(CSRG_BASED)
+# include <sys/types.h>
+#endif
+
+#if defined(CSRG_BASED) || defined(__linux__)
+# include <sys/socket.h>
 #endif
 
 #if defined(sun) && defined(_XOPEN_SOURCE)
@@ -104,6 +108,7 @@ typedef enum {B_FALSE, B_TRUE} boolean_t;
 #endif	/* HPUX */
 
 #if defined(__linux__) || defined(CSRG_BASED)
+#include <string.h>  /* memset for libcsa and others */
 typedef enum {B_FALSE, B_TRUE} boolean_t;
 #define MAXNAMELEN      	256
 #endif

cde/include/Makefile.am

@@ -26,7 +26,9 @@ nobase_include_HEADERS = Dt/Editor.h \
 	csa/csa.h \
 	Dt/Info.h \
 	Dt/Search.h \
-	Dt/Mmdb.h
+	Dt/Mmdb.h \
+	Dt/DtXinerama.h \
+	Dt/PamSvc.h
 
 
 

cde/include/PamSvc.h

@@ -1,58 +0,0 @@
-/*
- * CDE - Common Desktop Environment
- *
- * Copyright (c) 1993-2012, The Open Group. All rights reserved.
- *
- * These libraries and programs are free software; you can
- * redistribute them and/or modify them under the terms of the GNU
- * Lesser General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * These libraries and programs are distributed in the hope that
- * they will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with these libraries and programs; if not, write
- * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110-1301 USA
- */
-/* $XConsortium: pam_svc.h /main/3 1996/10/30 11:13:40 drk $ */
-/*******************************************************************************
-**
-**  "@(#)pam_svc.h 1.4 95/09/12
-**
-**  Copyright 1993, 1994, 1995 Sun Microsystems, Inc.  All rights reserved.
-**
-**  This file contains header info related to use of PAM
-**  (Pluggable Authentication Module) library.
-**
-*******************************************************************************/
-/*                                                                      *
- * (c) Copyright 1993, 1994 Hewlett-Packard Company                     *
- * (c) Copyright 1993, 1994 International Business Machines Corp.       *
- * (c) Copyright 1993, 1994, 1995 Sun Microsystems, Inc.                *
- * (c) Copyright 1993, 1994 Novell, Inc.                                *
- */
-
-#ifndef _DT_PAM_SVC_H
-#define _DT_PAM_SVC_H
-
-#include <sys/types.h>
-
-#define DT_BAD_GID 29 /* Invalid Group ID */
-#define DT_INITGROUP_FAIL 30 /* group IDs init failed */
-#define DT_BAD_UID 31 /* Invaid User ID */
-
-/*
- *	External procedure declarations
- */
-
-extern int _DtAuthentication(char*, char*, char*, char*, char*);
-extern int _DtAccounting(char*, char*, char[], char*, char*, pid_t, int, int);
-extern int _DtSetCred(char*, char *, uid_t, gid_t);
-
-#endif /* _DT_PAM_SVC_H */