From 3a0c2ae879b266d32c6417e1524eb2dceb3bbda4 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Tue, 21 Dec 2021 13:22:52 -0700 Subject: [PATCH] Move DtXinerama.h and PamSvc.h into include/Dt/ --- cde/include/{ => Dt}/DtXinerama.h | 0 cde/include/Makefile.am | 4 +- cde/include/PamSvc.h | 58 ----------------------------- cde/lib/DtPamSvc/PamSvc.c | 2 +- cde/lib/DtSvc/DtUtil2/SharedProcs.c | 2 +- cde/lib/DtXinerama/DtXinerama.c | 2 +- cde/programs/dtfile/Encaps.c | 2 +- cde/programs/dtlogin/dtchooser.c | 2 +- cde/programs/dtlogin/session.c | 2 +- cde/programs/dtlogin/vg.h | 2 +- cde/programs/dtlogin/vgmain.c | 2 +- cde/programs/dtsession/Sm.h | 2 +- cde/programs/dtsession/SmLock.c | 2 +- cde/programs/dtsession/SmMain.c | 2 +- cde/programs/dtsession/SmUI.c | 2 +- cde/programs/dtwm/WmMultiHead.c | 2 +- 16 files changed, 16 insertions(+), 72 deletions(-) rename cde/include/{ => Dt}/DtXinerama.h (100%) delete mode 100644 cde/include/PamSvc.h diff --git a/cde/include/DtXinerama.h b/cde/include/Dt/DtXinerama.h similarity index 100% rename from cde/include/DtXinerama.h rename to cde/include/Dt/DtXinerama.h diff --git a/cde/include/Makefile.am b/cde/include/Makefile.am index 2b923b889..5db7f3a8b 100644 --- a/cde/include/Makefile.am +++ b/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 diff --git a/cde/include/PamSvc.h b/cde/include/PamSvc.h deleted file mode 100644 index d76ff3e33..000000000 --- a/cde/include/PamSvc.h +++ /dev/null @@ -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 - -#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 */ diff --git a/cde/lib/DtPamSvc/PamSvc.c b/cde/lib/DtPamSvc/PamSvc.c index 625656295..8addc6d62 100644 --- a/cde/lib/DtPamSvc/PamSvc.c +++ b/cde/lib/DtPamSvc/PamSvc.c @@ -54,7 +54,7 @@ #if defined(__linux__) #include #endif -#include "PamSvc.h" +#include
/* * Local function declarations diff --git a/cde/lib/DtSvc/DtUtil2/SharedProcs.c b/cde/lib/DtSvc/DtUtil2/SharedProcs.c index e473abdfa..c53f35e4b 100644 --- a/cde/lib/DtSvc/DtUtil2/SharedProcs.c +++ b/cde/lib/DtSvc/DtUtil2/SharedProcs.c @@ -66,7 +66,7 @@ #include
#include
#ifdef USE_XINERAMA -#include +#include
#endif #include "SharedProcs.h" diff --git a/cde/lib/DtXinerama/DtXinerama.c b/cde/lib/DtXinerama/DtXinerama.c index 4ee3f8552..9de3f89e4 100644 --- a/cde/lib/DtXinerama/DtXinerama.c +++ b/cde/lib/DtXinerama/DtXinerama.c @@ -34,7 +34,7 @@ #include #include -#include "DtXinerama.h" +#include
/* return a DtXineramaInfo_t (or NULL if no Xinerama) available */ diff --git a/cde/programs/dtfile/Encaps.c b/cde/programs/dtfile/Encaps.c index ed72e1c85..0357b9a45 100644 --- a/cde/programs/dtfile/Encaps.c +++ b/cde/programs/dtfile/Encaps.c @@ -100,7 +100,7 @@ #include "Main.h" #include "ModAttr.h" #ifdef USE_XINERAMA -#include +#include
#endif #define MAX_NAME_LIST_SIZE 25 diff --git a/cde/programs/dtlogin/dtchooser.c b/cde/programs/dtlogin/dtchooser.c index d299a2680..f213b43eb 100644 --- a/cde/programs/dtlogin/dtchooser.c +++ b/cde/programs/dtlogin/dtchooser.c @@ -90,7 +90,7 @@ #include
#ifdef USE_XINERAMA -#include +#include
#endif diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c index c346ecc1f..e68b79393 100644 --- a/cde/programs/dtlogin/session.c +++ b/cde/programs/dtlogin/session.c @@ -109,7 +109,7 @@ #endif #ifdef HAS_PAM_LIBRARY -#include +#include
#endif int ApplyFontPathMods(struct display *d, Display *dpy); // fontpath.c diff --git a/cde/programs/dtlogin/vg.h b/cde/programs/dtlogin/vg.h index b079c84ee..7a34eaefd 100644 --- a/cde/programs/dtlogin/vg.h +++ b/cde/programs/dtlogin/vg.h @@ -67,7 +67,7 @@ extern int errno; #endif #ifdef USE_XINERAMA -# include +# include
#endif #define SIGVAL void diff --git a/cde/programs/dtlogin/vgmain.c b/cde/programs/dtlogin/vgmain.c index 323478b3f..cf3067986 100644 --- a/cde/programs/dtlogin/vgmain.c +++ b/cde/programs/dtlogin/vgmain.c @@ -91,7 +91,7 @@ #ifdef USE_XINERAMA -#include +#include
#endif #if !defined(NL_CAT_LOCALE) diff --git a/cde/programs/dtsession/Sm.h b/cde/programs/dtsession/Sm.h index 6b433a884..f1d8014ec 100644 --- a/cde/programs/dtsession/Sm.h +++ b/cde/programs/dtsession/Sm.h @@ -62,7 +62,7 @@ #include "SmError.h" #ifdef USE_XINERAMA -# include +# include
#endif /* diff --git a/cde/programs/dtsession/SmLock.c b/cde/programs/dtsession/SmLock.c index d881dfd54..83d1c183b 100644 --- a/cde/programs/dtsession/SmLock.c +++ b/cde/programs/dtsession/SmLock.c @@ -86,7 +86,7 @@ #endif #ifdef HAS_PAM_LIBRARY -#include +#include
#endif #include "Sm.h" diff --git a/cde/programs/dtsession/SmMain.c b/cde/programs/dtsession/SmMain.c index 6176003ed..5d7b6a97b 100644 --- a/cde/programs/dtsession/SmMain.c +++ b/cde/programs/dtsession/SmMain.c @@ -68,7 +68,7 @@ #include
#include
#ifdef USE_XINERAMA -#include /* JET - Xinerama support */ +#include
/* JET - Xinerama support */ #endif #include "Sm.h" #include "SmError.h" diff --git a/cde/programs/dtsession/SmUI.c b/cde/programs/dtsession/SmUI.c index 6f07ec406..eccb4665f 100644 --- a/cde/programs/dtsession/SmUI.c +++ b/cde/programs/dtsession/SmUI.c @@ -90,7 +90,7 @@ #include "SmGlobals.h" #ifdef USE_XINERAMA -#include +#include
#endif typedef enum { diff --git a/cde/programs/dtwm/WmMultiHead.c b/cde/programs/dtwm/WmMultiHead.c index b42f1e130..a850c176c 100644 --- a/cde/programs/dtwm/WmMultiHead.c +++ b/cde/programs/dtwm/WmMultiHead.c @@ -26,7 +26,7 @@ /* * Included Files: */ -#include +#include
#include "WmMultiHead.h"