Attachment #120162 for bug #162914

View | Details | Raw Unified | Return to bug 162914
Collapse All | Expand All

Lines 30-34 post-patch: Link Here

(-)x11-fm/xfe/Makefile (+2 lines)
30	${WRKSRC}/src/XFileExplorer.cpp \	30	${WRKSRC}/src/XFileExplorer.cpp \
31	${WRKSRC}/src/help.h \	31	${WRKSRC}/src/help.h \
32	${WRKSRC}/src/xfedefs.h	32	${WRKSRC}/src/xfedefs.h
		33	@${REINPLACE_CMD} 's/unsigned FXchar/FXuchar/' \
		34	${WRKSRC}/src/xfeutils.cpp
33		35
34	.include <bsd.port.mk>	36	.include <bsd.port.mk>




 #include <grp.h>
 #include <pwd.h>
 #include <errno.h>
@@ -175,7 +180,9 @@
 #ifdef BSD_UTMP
 static int tslot = -1;		/* index to our slot in the utmp file */
 #endif /* BSD_UTMP */
+#if defined(BSD_UTMP) || defined(SVR4_UTMP)
 static struct utmp utent;	/* our current utmp entry */
+#endif
 
 /*  Catch a SIGCHLD signal and exit if the direct child has died.
  */
@@ -398,7 +403,7 @@
  */
 static char* get_pseudo_tty(int* pmaster, int* pslave)

Return to bug 162914

Lines 14-19 Link Here

(-)x11-fm/xfe/files/patch-xvt_ttyinit.c (+10 lines)
14	#include <grp.h>	14	#include <grp.h>
15	#include <pwd.h>	15	#include <pwd.h>
16	#include <errno.h>	16	#include <errno.h>
		17	@@ -175,7 +180,9 @@
		18	#ifdef BSD_UTMP
		19	static int tslot = -1; /* index to our slot in the utmp file */
		20	#endif /* BSD_UTMP */
		21	+#if defined(BSD_UTMP) \|\| defined(SVR4_UTMP)
		22	static struct utmp utent; /* our current utmp entry */
		23	+#endif
		24
		25	/* Catch a SIGCHLD signal and exit if the direct child has died.
		26	*/
17	@@ -398,7 +403,7 @@	27	@@ -398,7 +403,7 @@
18	*/	28	*/
19	static char* get_pseudo_tty(int* pmaster, int* pslave)	29	static char* get_pseudo_tty(int* pmaster, int* pslave)