On WINNT, procmgmt_softsig.h exists to implement our opr softsig
routines in terms of procmgmt routines. Any time we include
opr/softsig.h in cross-platform code, we currently must also include
afs/procmgmt_softsig.h so we can build on WINNT. We currently do not
do this in src/xstat, causing build failures on WINNT.
To avoid this, just make opr/softsig.h include procmgmt_softsig.h
itself, so all of the opr/softsig.h users don't have to remember to do
this. Link xstat_*_test against procmgmt, so linking will succeed for
those tools.
Change-Id: I2dc8226d438be25cdccbe96474220d7c81ae25b9
Reviewed-on: https://gerrit.openafs.org/13824
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
int opr_softsig_Init(void);
int opr_softsig_Register(int sig, void (*handler)(int));
+#ifdef AFS_NT40_ENV
+# include <afs/procmgmt_softsig.h>
+#endif
+
#endif
#include <afs/opr.h>
#ifdef AFS_PTHREAD_ENV
# include <opr/softsig.h>
-# include <afs/procmgmt_softsig.h> /* must come after softsig.h */
#endif
#ifdef AFS_NT40_ENV
#include <roken.h> /* Must come after procmgmt.h */
#ifdef AFS_PTHREAD_ENV
#include <opr/softsig.h>
- #include <afs/procmgmt_softsig.h> /* Must come after softsig.h */
#endif
#include <afs/opr.h>
#include "afsutil.h"
#include <opr/lock.h>
#include <opr/proc.h>
#include <opr/softsig.h>
-#include <afs/procmgmt_softsig.h> /* must come after softsig.h */
#include <afs/cmd.h>
#include <afs/ptclient.h>
#include <afs/afsint.h>
#include <roken.h>
#ifdef AFS_PTHREAD_ENV
# include <opr/softsig.h>
-# include <afs/procmgmt_softsig.h> /* must come after softsig.h */
#endif
#ifdef AFS_NT40_ENV
#ifdef AFS_PTHREAD_ENV
# include <opr/lock.h>
# include <opr/softsig.h>
-# include <afs/procmgmt_softsig.h> /* must come after softsig */
#endif
#ifdef AFS_NT40_ENV
$(LIBDIR)\afshcrypto.lib \
$(LIBDIR)\afspthread.lib \
$(LIBDIR)\afs\afspioctl.lib \
+ $(LIBDIR)\afs\afsprocmgmt.lib \
$(LIBDIR)\afs\mtafsutil.lib \
$(LIBDIR)\afs\afsreg.lib \
$(LIBDIR)\afsroken.lib \