external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Fixes for dtlogin and dtcm on FreeBSD.

Browse source
This commit is contained in:
Ulrich Wilkens 2012-09-05 16:26:28 +02:00 • committed by Jon Trulson
parent 591e58fe1a
commit 33da5fa944
6 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cde/programs/dtcm/dtcm/cm_i18n.c
View file

@ -388,6 +388,8 @@ cm_printf(double value, int decimal_pt)
} }
#ifdef SunOS #ifdef SunOS
fconvert(value, decimal_pt, &deci_pt, &sign, buf); fconvert(value, decimal_pt, &deci_pt, &sign, buf);
#elif defined(__FreeBSD__)
snprintf(buf, decimal_pt, "%f", value);
#else #else
/* this version, available on the HP and AIX machine is not reentrant. */ /* this version, available on the HP and AIX machine is not reentrant. */

6
cde/programs/dtcm/dtcm/deskset.c
View file

@ -132,7 +132,7 @@ ds_position_popup(Widget base, Widget popup, ds_location_op location_op) {
XmNy, &base_y, XmNy, &base_y,
XmNwidth, &base_width, XmNwidth, &base_width,
XmNheight, &base_height, XmNheight, &base_height,
0) ; NULL) ;
bx = (int) base_x ; bx = (int) base_x ;
by = (int) base_y ; by = (int) base_y ;
bw = (int) base_width ; bw = (int) base_width ;
@ -143,7 +143,7 @@ ds_position_popup(Widget base, Widget popup, ds_location_op location_op) {
XmNy, &popup_y, XmNy, &popup_y,
XmNwidth, &popup_width, XmNwidth, &popup_width,
XmNheight, &popup_height, XmNheight, &popup_height,
0) ; NULL) ;
px = (int) popup_x ; px = (int) popup_x ;
py = (int) popup_y ; py = (int) popup_y ;
@ -232,7 +232,7 @@ ds_force_popup_on_screen(Widget popup, int *popup_x_p, int *popup_y_p) {
XtVaGetValues(popup, XtVaGetValues(popup,
XmNwidth, &popup_width, XmNwidth, &popup_width,
XmNheight, &popup_height, XmNheight, &popup_height,
0) ; NULL) ;
/* Make sure frame does not go off side of screen */ /* Make sure frame does not go off side of screen */

5
cde/programs/dtlogin/account.c
View file

@ -57,7 +57,12 @@
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#if defined(__FreeBSD__)
#include <utmpx.h>
#else
#include <utmp.h> #include <utmp.h>
#endif
#include <time.h> #include <time.h>
#include "dm.h" #include "dm.h"

9
cde/programs/dtlogin/dm.c
View file

@ -1697,8 +1697,13 @@ GettyMessage( struct display *d, int msgnum )
int int
GettyRunning( struct display *d ) GettyRunning( struct display *d )
{ {
#if defined(__FreeBSD__)
struct utmpx utmp; /* local struct for new entry */
struct utmpx *u; /* pointer to entry in utmp file */
#else
struct utmp utmp; /* local struct for new entry */ struct utmp utmp; /* local struct for new entry */
struct utmp *u; /* pointer to entry in utmp file */ struct utmp *u; /* pointer to entry in utmp file */
#endif
int rvalue; /* return value (TRUE or FALSE) */ int rvalue; /* return value (TRUE or FALSE) */
char buf[32]; char buf[32];
@ -1717,7 +1722,11 @@ GettyRunning( struct display *d )
return FALSE; return FALSE;
#if defined(__FreeBSD__)
bzero(&utmp, sizeof(struct utmpx));
#else
bzero(&utmp, sizeof(struct utmp)); bzero(&utmp, sizeof(struct utmp));
#endif
#ifdef _AIX #ifdef _AIX
if (!strcmp(d->gettyLine,"console")) { if (!strcmp(d->gettyLine,"console")) {

4
cde/programs/dtlogin/fontpath.c
View file

@ -39,7 +39,11 @@
# include <signal.h> # include <signal.h>
# include <X11/Xatom.h> # include <X11/Xatom.h>
# include <setjmp.h> # include <setjmp.h>
#if defined(__FreeBSD__)
# include <utmpx.h>
#else
# include <utmp.h> # include <utmp.h>
#endif
# include "vgproto.h" # include "vgproto.h"
/* /*

4
cde/programs/dtlogin/session.c
View file

@ -65,7 +65,11 @@
# include <signal.h> # include <signal.h>
# include <X11/Xatom.h> # include <X11/Xatom.h>
# include <setjmp.h> # include <setjmp.h>
#if defined(__FreeBSD__)
# include <utmpx.h>
#else
# include <utmp.h> # include <utmp.h>
#endif
#include <unistd.h> #include <unistd.h>
#include <pwd.h> #include <pwd.h>
#include <dirent.h> #include <dirent.h>