debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
parent 2902373dbb 4d7f9df692
commit 8ba629fcd1
12 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

5
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 <RFCMIME.h>
/* Iconv not defined for linux. Use the EUSCompat stubs instead. */
#if !defined(__linux__)
# include <iconv.h>
#endif
#include <iconv.h>
#include <EUSCompat.h>
#include <locale.h>
#include <LocaleXlate.h>

5
cde/programs/dtcm/dtcm/cm_i18n.c
View File

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

7
cde/programs/dthelp/dthelpprint/PrintTopics.c
View File

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

7
cde/programs/dtmail/libDtMail/Common/Session.C
View File

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

8
cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
View File

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

2
cde/programs/nsgmls/Imakefile
View File

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