debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix FreeBSD 10.1 build

Browse Source
This commit is contained in:
Ulrich Wilkens
2014-11-20 02:11:47 +01:00
committed by Jon Trulson
parent bf0666a330
commit 29294e0373
18 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ USE_GCC = UseGcc
#if OSMajorVersion >= 10
#define CppArgs -Wno-invalid-pp-token
#define DirFailPrefix -
#else
#define CppArgs /**/
#endif

2
cde/config/imake/imakemdep.h
View File

@@ -354,7 +354,7 @@ char *cpp_argv[ARGUMENTS] = {
{"-D__powerpc64__", "1"},
# endif
# ifdef __GNUC__
# if defined(__GNUC__) && !defined(__llvm__)
"-traditional",
# endif
# ifdef __llvm__

1
cde/lib/DtTerm/TermPrim/TermPrimBuffer.c
View File

@@ -38,6 +38,7 @@ static char rcs_id[] = "$XConsortium: TermPrimBuffer.c /main/1 1996/04/21 19:16:
#define USE_MEMCPY /* use memcpy for line movement... */
#include <stdlib.h>
#include <wchar.h>
#include <Xm/Xm.h>
#include "TermHeader.h" /* for MIN/MAX */

1
cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c
View File

@@ -38,6 +38,7 @@ static char rcs_id[] = "$XConsortium: TermPrimBufferWc.c /main/1 1996/04/21 19:1
#define USE_MEMCPY /* use memcpy for line movement... */
#include <stdlib.h>
#include <wchar.h>
#include <Xm/Xm.h>
#include "TermHeader.h" /* for MIN/MAX */

1
cde/lib/DtTerm/TermPrim/TermPrimRenderLineDraw.c
View File

@@ -33,6 +33,7 @@ static char rcs_id[] = "$XConsortium: TermPrimRenderLineDraw.c /main/1 1996/04/2
* (c) Copyright 1993, 1994 Novell, Inc. *
*/
#include <stdlib.h>
#include <wchar.h>
#include "TermHeader.h"

1
cde/lib/DtWidget/Editor.c
View File

@@ -51,6 +51,7 @@
*/
#include <ctype.h>
#include <stdlib.h>
#if defined(__hpux) || defined(__osf__) || defined(USL)
# include <wchar.h>

3
cde/programs/dthelp/parser/canon1/build/Imakefile
View File

@@ -63,8 +63,7 @@ NormalProgramTarget(build,$(OBJS),delim.h $(LOCAL_LIBRARIES),$(LOCAL_LIBRARIES),
$(CPRODS): $(HELPUTILSRC)/context $(HELPTAGSRC)/delim.bld context.dat
$(RM) $(CPRODS) $(CTRASH)
/* get application-specific delim.dat */
$(CP) $(HELPTAGSRC)/delim.bld delim.dat
$(CP) $(HELPTAGSRC)/delim.bld delim.dat /* appl.-specific delim.dat */
$(HELPUTILSRC)/context sparse
$(HELPUTILSRC)/context:

3
cde/programs/dthelp/parser/canon1/eltdef/Imakefile
View File

@@ -61,8 +61,7 @@ $(EPRODS): eltdef $(HELPIFFILE) $(HELPTSSFILE)
$(CPRODS): $(HELPUTILSRC)/context $(HELPTAGSRC)/delim.elt context.dat
$(RM) $(CPRODS) $(CTRASH)
/* get application-specific delim.dat */
$(CP) $(HELPTAGSRC)/delim.elt delim.dat
$(CP) $(HELPTAGSRC)/delim.elt delim.dat /* appl.-specific delim.dat */
$(HELPUTILSRC)/context
$(HELPUTILSRC)/context:

3
cde/programs/dthelp/parser/canon1/parser/Imakefile
View File

@@ -99,8 +99,7 @@ $(HELPTAGSRC)/dthelp_ctag1: parser
$(CPRODS): $(HELPUTILSRC)/context $(HELPTAGSRC)/delim.par context.dat
$(RM) $(CPRODS) $(CTRASH)
/* get application-specific delim.dat */
$(CP) $(HELPTAGSRC)/delim.par delim.dat
$(CP) $(HELPTAGSRC)/delim.par delim.dat /* appl.-specific delim.dat */
$(HELPUTILSRC)/context
$(HELPUTILSRC)/context:

3
cde/programs/dthelp/parser/pass1/build/Imakefile
View File

@@ -63,8 +63,7 @@ NormalProgramTarget(build,$(OBJS),delim.h $(LOCAL_LIBRARIES),$(LOCAL_LIBRARIES),
$(CPRODS): $(HELPUTILSRC)/context $(HELPTAGSRC)/delim.bld context.dat
$(RM) $(CPRODS) $(CTRASH)
/* get application-specific delim.dat */
$(CP) $(HELPTAGSRC)/delim.bld delim.dat
$(CP) $(HELPTAGSRC)/delim.bld delim.dat /* appl.-specific delim.dat */
$(HELPUTILSRC)/context sparse
$(HELPUTILSRC)/context:

3
cde/programs/dthelp/parser/pass1/eltdef/Imakefile
View File

@@ -61,8 +61,7 @@ $(EPRODS): eltdef $(HELPIFFILE) $(HELPTSSFILE)
$(CPRODS): $(HELPUTILSRC)/context $(HELPTAGSRC)/delim.elt context.dat
$(RM) $(CPRODS) $(CTRASH)
/* get application-specific delim.dat */
$(CP) $(HELPTAGSRC)/delim.elt delim.dat
$(CP) $(HELPTAGSRC)/delim.elt delim.dat /* appl.-specific delim.dat */
$(HELPUTILSRC)/context
$(HELPUTILSRC)/context:

3
cde/programs/dthelp/parser/pass1/parser/Imakefile
View File

@@ -99,8 +99,7 @@ $(HELPTAGSRC)/dthelp_htag1: parser
$(CPRODS): $(HELPUTILSRC)/context $(HELPTAGSRC)/delim.par context.dat
$(RM) $(CPRODS) $(CTRASH)
/* get application-specific delim.dat */
$(CP) $(HELPTAGSRC)/delim.par delim.dat
$(CP) $(HELPTAGSRC)/delim.par delim.dat /* appl.-specific delim.dat */
$(HELPUTILSRC)/context
$(HELPUTILSRC)/context:

3
cde/programs/dthelp/parser/pass2/build/Imakefile
View File

@@ -59,8 +59,7 @@ NormalProgramTarget(build,$(OBJS),delim.h $(LOCAL_LIBRARIES),$(LOCAL_LIBRARIES),
$(CPRODS): $(SDLUTILSRC)/context $(HTAG2SRC)/delim.bld context.dat
$(RM) $(CPRODS) $(CTRASH)
/* get application-specific delim.dat */
$(CP) $(HTAG2SRC)/delim.bld delim.dat
$(CP) $(HTAG2SRC)/delim.bld delim.dat /* appl.-specific delim.dat */
$(SDLUTILSRC)/context sparse
$(SDLUTILSRC)/context:

3
cde/programs/dthelp/parser/pass2/eltdef/Imakefile
View File

@@ -58,8 +58,7 @@ $(EPRODS): eltdef $(SDLIFFILE)
$(CPRODS): $(SDLUTILSRC)/context $(HTAG2SRC)/delim.elt context.dat
$(RM) $(CPRODS) $(CTRASH)
/* get application-specific delim.dat */
$(CP) $(HTAG2SRC)/delim.elt delim.dat
$(CP) $(HTAG2SRC)/delim.elt delim.dat /* appl.-specific delim.dat */
$(SDLUTILSRC)/context
$(SDLUTILSRC)/context:

3
cde/programs/dthelp/parser/pass2/parser/Imakefile
View File

@@ -90,8 +90,7 @@ $(HTAG2SRC)/dthelp_htag2: parser
$(CPRODS): $(SDLUTILSRC)/context $(HTAG2SRC)/delim.par context.dat
$(RM) $(CPRODS) $(CTRASH)
/* get application-specific delim.dat */
$(CP) $(HTAG2SRC)/delim.par delim.dat
$(CP) $(HTAG2SRC)/delim.par delim.dat /* appl.-specific delim.dat */
$(SDLUTILSRC)/context
$(SDLUTILSRC)/context:

2
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C
View File

@@ -116,7 +116,7 @@ DtSR_BookcaseSearchEntry::~DtSR_BookcaseSearchEntry()
void
DtSR_BookcaseSearchEntry::search_zones(UAS_SearchZones& search_zones)
{
if (! bcases().length() > 0) {
if (! (bcases().length() > 0)) {
#ifdef DEBUG
fprintf(stderr, "search_zones tried on empty BookcaseEntry list\n");
#endif

2
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/TextParser.C
View File

@@ -50,7 +50,7 @@ StringParser::brute_force(const char* text_in, int n_of_pats,
else if (patterns == NULL || *patterns == '\0')
return NULL;
if (! n_of_pats > 0)
if (! (n_of_pats > 0))
return NULL;
char** pat_tbl = new char*[n_of_pats + 1];

2
cde/programs/dtinfo/dtinfogen/infolib/etc/SearchStorage.h
View File

@@ -23,7 +23,7 @@
/* $XConsortium: SearchStorage.h /main/3 1996/07/18 16:49:38 drk $ */
#ifndef SRCH_STOR_HDR
#define SCRH_STOR_HDR
#define SRCH_STOR_HDR
#include <stdio.h>