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

Merge branch 'master' into cde-next

Browse source
This commit is contained in:
Jon Trulson 2018-06-24 15:46:55 -06:00
commit c2cabbfa8b
5 changed files with 48 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cde/config/cf/site.def
View file

@ -126,7 +126,9 @@ XCOMM or building non-C locales will cause build failures.
XCOMM Make sure you have installed the de_DE, es_ES, fr_FR and it_IT locales.
XCOMM or building non-C locales will cause build failures.
XCOMM DtLocalesToBuild: de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1 en_US.UTF-8
# define DtLocalesToBuild en_US.UTF-8
# if !defined(DtLocalesToBuild)
# define DtLocalesToBuild en_US.UTF-8
# endif
# define UTF8_NLS_SUPPORT
#endif

11
cde/config/cf/sun.cf
View file

@ -29,8 +29,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
* configuration varibles used here.
*
* If you don't tell us which C compiler you have, we assume you have
* the Gcc C compiler under Solaris 5.x.
* under SunOS 4.1.x
* the Gcc C compiler under Solaris 2.x.
*
* === C++ Compiler Setup ==========================================
*
@ -43,8 +42,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
* In any case, you may also need to set CplusplusDependIncludes.
*
* If you say you have the SunPro C++ compiler, we assume you have
* version 5.0.x of the compiler. If you have version 4.0.x instead,
* define CplusplusCompilerMajorVersion as 4 in host.def.
* version 5.0.x of the compiler. If you have an earlier version
* instead, define CplusplusCompilerMajorVersion in host.def.
*
*/
@ -182,8 +181,10 @@ XCOMM Gnu C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
# define OptimizedCplusplusDebugFlags -O2 -erroff=attrskipunsup
#endif
#ifndef CplusplusDependIncludes
#if CplusplusCompilerMajorVersion > 3
#if CplusplusCompilerMajorVersion > 4
# define CplusplusDependIncludes -I/opt/solarisstudio/prod/include/CC -I/opt/solarisstudio/prod/include/CC/Cstd -I/opt/solarisstudio/prod/include/CC/std
#elif CplusplusCompilerMajorVersion > 3
# define CplusplusDependIncludes -I/opt/SUNWspro/SC4.0/include/CC
#elif CplusplusCompilerMajorVersion > 2
# define CplusplusDependIncludes -I/opt/SUNWspro/SC3.0/include/CC
#else

33
cde/lib/tt/lib/util/tt_host.C
View file

@ -207,7 +207,38 @@ init_byname(_Tt_string name)
memset((char*) &host_buf, 0, sizeof(_Xgethostbynameparams));
if (name.len() == 0) {
_name = _tt_gethostname();
/* JET - many machines in this modern era have a hostname
* that does not have an IP address associated with it.
* So, we do a quick check to see if XGethostbyname() is
* happy with the returned name. If it isn't, then we set
* the name to "localhost", which should always exist on
* any machine with IP networking. If your machine does
* not have IP networking, you shouldn't be running TT :)
*
* This should fix those cases, particularly on BSD
* machines, whereby TT fails to start. They should no
* longer need to add their hostname manually to
* /etc/hosts (as an alias to localhost) in order to start
* CDE
*/
_name = _tt_gethostname();
if(!_XGethostbyname((char *)_name, host_buf))
{
/* this gets a little verbose - you see one for every
* client, so if-0 out. Leave for future debugging
* though...
*/
#if 0
_tt_syslog(0, LOG_WARNING, "_XGethostbyname(%s) failed,"
" defaulting to localhost",
(const char *)_name);
#endif
/* fall back to localhost */
_name = "localhost";
}
/* clear host_buf again, for the final run below */
memset((char*) &host_buf, 0, sizeof(_Xgethostbynameparams));
} else {
qual = name.split(':',_name);
if (_name.len()== 0) {

4
cde/programs/dtmail/dtmail/FindDialog.C
View file

@ -729,13 +729,13 @@ FindDialog::compareMessage(DtMailMessageHandle handle)
return(found);
}
#if !defined(CSRG_BASED) && !defined(__linux__) && !defined(sun)
#if !defined(CSRG_BASED) && !defined(__linux__)
//
// See if string 'toFind' is anyware in string 'str'.
// A case-insensitive version of strstr().
//
static const char *
strcasestr(const char *str, const char *toFind)
FindDialog::strcasestr(const char *str, const char *toFind)
{
const char *result = NULL; // Default to not found.

5
cde/programs/dtmail/dtmail/FindDialog.h
View file

@ -102,6 +102,11 @@ private:
Boolean compareMessage(DtMailMessageHandle handle);
#if !defined(CSRG_BASED) && !defined(__linux__)
static const char * strcasestr(const char *str,
const char *toFind);
#endif
Boolean compareHeader(DtMailEnv & error,
DtMailValueSeq & seq,
const char * cmpToString);