diff options
Diffstat (limited to 'libXt/src/Shell.c')
| -rw-r--r-- | libXt/src/Shell.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libXt/src/Shell.c b/libXt/src/Shell.c index 8a44651d1..b78b62af6 100644 --- a/libXt/src/Shell.c +++ b/libXt/src/Shell.c @@ -84,9 +84,12 @@ in this Software without prior written authorization from The Open Group. #include "VendorP.h" #include <X11/Xatom.h> #include <X11/Xlocale.h> +#ifndef _MSC_VER #include <X11/ICE/ICElib.h> +#endif #include <stdio.h> #include <stdlib.h> +#include <unistd.h> #ifdef EDITRES #include <X11/Xmu/Editres.h> @@ -718,9 +721,11 @@ static XtResource sessionResources[]= Offset(session.current_dir), XtRString, (XtPointer) NULL}, {XtNprogramPath, XtCProgramPath, XtRString, sizeof(String), Offset(session.program_path), XtRString, (XtPointer) NULL}, +#ifndef XT_NO_SM {XtNrestartStyle, XtCRestartStyle, XtRRestartStyle, sizeof(unsigned char), Offset(session.restart_style), XtRImmediate, (XtPointer) SmRestartIfRunning}, +#endif {XtNjoinSession, XtCJoinSession, XtRBoolean, sizeof(Boolean), Offset(session.join_session), XtRImmediate, (XtPointer) True}, {XtNsaveCallback, XtCCallback, XtRCallback, sizeof(XtPointer), @@ -1103,7 +1108,9 @@ static void ApplicationInitialize( static void JoinSession(SessionShellWidget); static void SetSessionProperties(SessionShellWidget, Boolean, unsigned long, unsigned long); +#ifndef XT_NO_SM static void StopManagingSession(SessionShellWidget, SmcConn); +#endif typedef struct _XtSaveYourselfRec { XtSaveYourself next; @@ -2655,7 +2662,6 @@ static Boolean SessionSetValues( if ((cw->session.join_session && !nw->session.join_session) || (cw->session.connection && !nw->session.connection)) StopManagingSession(nw, nw->session.connection); -#endif /* !XT_NO_SM */ if (cw->wm.client_leader != nw->wm.client_leader || cw->session.session_id != nw->session.session_id) { @@ -2678,6 +2684,7 @@ static Boolean SessionSetValues( strlen(nw->session.session_id)); } } +#endif /* !XT_NO_SM */ return False; } @@ -2764,10 +2771,12 @@ static String *EditCommand(String, String *, String *); static Boolean ExamineToken(XtPointer); static void GetIceEvent(XtPointer, int *, XtInputId *); static XtCheckpointToken GetToken(Widget, int); +#ifndef XT_NO_SM static void XtCallCancelCallbacks(SmcConn, SmPointer); static void XtCallDieCallbacks(SmcConn, SmPointer); static void XtCallSaveCallbacks(SmcConn, SmPointer, int, Bool, int, Bool); static void XtCallSaveCompleteCallbacks(SmcConn, SmPointer); +#endif /* !XT_NO_SM */ #ifndef XT_NO_SM static void StopManagingSession( |