initial illumos port
This commit is contained in:
committed by
Jon Trulson
parent
3c14b8b5ce
commit
468d576030
@@ -201,16 +201,16 @@ dispname(const char *hdr)
|
||||
|
||||
if (hdr == 0)
|
||||
return 0;
|
||||
if (((cp = strchr(hdr, '<')) != 0) && (cp > hdr)) {
|
||||
if (((cp = const_cast <char *> (strchr(hdr, '<'))) != 0) && (cp > hdr)) {
|
||||
*cp = 0;
|
||||
if ((*hdr == '"') && ((cp = strrchr(++hdr, '"')) != 0))
|
||||
if ((*hdr == '"') && ((cp = const_cast <char *> (strrchr(++hdr, '"'))) != 0))
|
||||
*cp = 0;
|
||||
return (char *)hdr;
|
||||
} else if ((cp = strchr(hdr, '(')) != 0) {
|
||||
} else if ((cp = const_cast <char *> (strchr(hdr, '('))) != 0) {
|
||||
hdr = ++cp;
|
||||
if ((cp = strchr(hdr, '+')) != 0)
|
||||
if ((cp = const_cast <char *> (strchr(hdr, '+'))) != 0)
|
||||
*cp = 0;
|
||||
if ((cp = strrchr(hdr, ')')) != 0)
|
||||
if ((cp = const_cast <char *> (strrchr(hdr, ')'))) != 0)
|
||||
*cp = 0;
|
||||
return (char *)hdr;
|
||||
}
|
||||
|
||||
@@ -728,7 +728,7 @@ FindDialog::compareMessage(DtMailMessageHandle handle)
|
||||
return(found);
|
||||
}
|
||||
|
||||
#if !defined(CSRG_BASED) && !defined(linux)
|
||||
#if !defined(CSRG_BASED) && !defined(linux) && !defined(sun)
|
||||
//
|
||||
// See if string 'toFind' is anyware in string 'str'.
|
||||
// A case-insensitive version of strstr().
|
||||
|
||||
@@ -957,6 +957,12 @@ Usage(char *progname)
|
||||
|
||||
nl_catd DT_catd = (nl_catd) -1; // catgets file descriptor
|
||||
|
||||
#if defined(reallyoldsun) || defined(USL)
|
||||
#define SA_HANDLER_TYPE void (*)(void)
|
||||
#else
|
||||
#define SA_HANDLER_TYPE void (*)(int)
|
||||
#endif
|
||||
|
||||
void RoamApp::initialize(int *argcp, char **argv)
|
||||
{
|
||||
char **av = argv;
|
||||
@@ -991,11 +997,7 @@ void RoamApp::initialize(int *argcp, char **argv)
|
||||
|
||||
action = &action_buf;
|
||||
memset((void*) action, 0, sizeof(struct sigaction));
|
||||
#ifdef USL
|
||||
action->sa_handler = (void (*)())panicQuitSignalHandler;
|
||||
#else
|
||||
action->sa_handler = panicQuitSignalHandler;
|
||||
#endif
|
||||
action->sa_handler = (SA_HANDLER_TYPE) panicQuitSignalHandler;
|
||||
action->sa_flags = 0;
|
||||
sigaction(SIGHUP, action, NULL);
|
||||
sigaction(SIGINT, action, NULL);
|
||||
|
||||
@@ -143,7 +143,7 @@ extern XtPointer _XmStringUngenerate (
|
||||
#include <sys/file.h>
|
||||
|
||||
|
||||
extern int forceUpdate( Widget );
|
||||
extern void forceUpdate( Widget );
|
||||
|
||||
RoamCmd::RoamCmd
|
||||
(char *name, char *label, int active, RoamMenuWindow *window)
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
#include <Xm/Xm.h>
|
||||
#include <Xm/MessageB.h>
|
||||
#include <assert.h>
|
||||
extern int forceUpdate( Widget );
|
||||
extern void forceUpdate( Widget );
|
||||
|
||||
|
||||
RoamInterruptibleCmd::RoamInterruptibleCmd ( char *name,
|
||||
|
||||
Reference in New Issue
Block a user