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

Merge branch 'master' into utf8-conversion

Browse source
This commit is contained in:
Jon Trulson 2019-01-15 12:02:49 -07:00
commit 8ba629fcd1
12 changed files with 13 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cde/config/cf/FreeBSD.cf
View file

@ -232,6 +232,7 @@ ICONVSYSLIB != if test -f /usr/local/include/iconv.h; then echo -liconv; else ec
#define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR) #define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
#define TroffCmd groff -Tps #define TroffCmd groff -Tps
#define M4Cmd /usr/bin/m4
#define SetTtyGroup YES #define SetTtyGroup YES
#define HasNdbm YES #define HasNdbm YES
#define HasShm YES #define HasShm YES

1
cde/config/cf/NetBSD.cf
View file

@ -185,6 +185,7 @@ XCOMM operating system: OSName
#define NeqnCmd neqn -Tlatin1 #define NeqnCmd neqn -Tlatin1
#define EqnCmd eqn -Tps #define EqnCmd eqn -Tps
#define TroffCmd groff -Tps #define TroffCmd groff -Tps
#define M4Cmd /usr/bin/m4
/* /*
* To use the NetBSD Aperture driver * To use the NetBSD Aperture driver

2
cde/config/cf/OpenBSD.cf
View file

@ -277,6 +277,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# define TblCmd cat # define TblCmd cat
#endif #endif
#define M4Cmd /usr/bin/m4
#define HasGroff YES #define HasGroff YES
#ifndef HasCookieMaker #ifndef HasCookieMaker

1
cde/config/cf/linux.cf
View file

@ -87,6 +87,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define HasMakefileSafeInclude YES #define HasMakefileSafeInclude YES
#define DependFileName .depend #define DependFileName .depend
#define DependCmd $(CC) -E -MM -MG #define DependCmd $(CC) -E -MM -MG
#define M4Cmd /usr/bin/m4
#ifdef IncludeMakefile #ifdef IncludeMakefile
# undef IncludeMakefile # undef IncludeMakefile

7
cde/include/EUSCompat.h
View file

@ -106,13 +106,6 @@ typedef enum {B_FALSE, B_TRUE} boolean_t;
#if defined(__linux__) || defined(CSRG_BASED) #if defined(__linux__) || defined(CSRG_BASED)
typedef enum {B_FALSE, B_TRUE} boolean_t; typedef enum {B_FALSE, B_TRUE} boolean_t;
#define MAXNAMELEN 256 #define MAXNAMELEN 256
#if !defined(CSRG_BASED)
#define iconv_t int
#define iconv_open(a, b) ((iconv_t) -1)
#define iconv(a, b, c, d, e) ((size_t) 0)
#define iconv_close(a) (0)
#endif
#endif #endif

3
cde/programs/dtcalc/motif.c
View file

@ -3295,7 +3295,8 @@ static void
modelineValueChanged(Widget widget, XtPointer client_data, XtPointer call_data) modelineValueChanged(Widget widget, XtPointer client_data, XtPointer call_data)
{ {
Arg args[1]; Arg args[1];
int val, choice; int choice;
XtArgVal val;
X->mtype = (enum menu_type) client_data ; X->mtype = (enum menu_type) client_data ;
XtSetArg (args[0], XmNuserData, &val); XtSetArg (args[0], XmNuserData, &val);

3
cde/programs/dtcm/dtcm/RFCMIME.c
View file

@ -56,10 +56,7 @@ static char sccsid[] = "$TOG: RFCMIME.c /main/11 1999/06/30 12:08:55 mgreess $";
#include <assert.h> #include <assert.h>
#include <RFCMIME.h> #include <RFCMIME.h>
/* Iconv not defined for linux. Use the EUSCompat stubs instead. */
#if !defined(__linux__)
#include <iconv.h> #include <iconv.h>
#endif
#include <EUSCompat.h> #include <EUSCompat.h>
#include <locale.h> #include <locale.h>
#include <LocaleXlate.h> #include <LocaleXlate.h>

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

@ -70,10 +70,7 @@ should be fixed in the future.
#include <Xm/Xm.h> #include <Xm/Xm.h>
#include <langinfo.h> #include <langinfo.h>
/* Iconv not defined for linux. Use the EUSCompat stubs instead. */
#if !defined(__linux__)
#include <iconv.h> #include <iconv.h>
#endif
#include <EUSCompat.h> #include <EUSCompat.h>
#include "util.h" #include "util.h"

5
cde/programs/dthelp/dthelpprint/PrintTopics.c
View file

@ -53,12 +53,7 @@ $COPYRIGHT$:
#include <langinfo.h> #include <langinfo.h>
#endif #endif
/* Iconv not defined for linux. Use the EUSCompat stubs instead. */
#if !defined(__linux__)
#include <iconv.h> #include <iconv.h>
#else
# include <EUSCompat.h>
#endif
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>

5
cde/programs/dtmail/libDtMail/Common/Session.C
View file

@ -86,12 +86,7 @@
extern "C" { extern "C" {
#endif #endif
#if !defined(__linux__)
#include <iconv.h> #include <iconv.h>
#else
// Iconv not defined for linux. Use the EUSCompat stubs instead.
# include <EUSCompat.h>
#endif
#if defined(SunOS) && (SunOS < 55) #if defined(SunOS) && (SunOS < 55)
} }

6
cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
View file

@ -81,13 +81,7 @@
extern "C" { extern "C" {
#endif #endif
#if !defined(__linux__)
// Iconv not defined for linux. Use the EUSCompat stubs instead. */
#include <iconv.h> #include <iconv.h>
#else
# include <EUSCompat.h>
#endif
#if defined(SunOS) && (SunOS < 55) #if defined(SunOS) && (SunOS < 55)
} }

2
cde/programs/nsgmls/Imakefile
View file

@ -82,7 +82,7 @@ CXXOPTIONS = \
*/ */
CXXTEMPLATEFLAGS = $(NOIMPLTEMPLATES) CXXTEMPLATEFLAGS = $(NOIMPLTEMPLATES)
M4 = /usr/bin/m4 M4 = M4Cmd
#endif #endif