Fix FreeBSD 10.1 build

diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index 2ef9ba0ea8ef9abc3e64c036bfb5be6a560a5f68..ce3e62c28433d787d197e77811b78f9758d2e490 100644 (file)
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -36,6 +36,7 @@ USE_GCC = UseGcc
 
 #if OSMajorVersion >= 10
 #define CppArgs                        -Wno-invalid-pp-token
+#define DirFailPrefix          -
 #else
 #define CppArgs                        /**/
 #endif

diff --git a/cde/config/imake/imakemdep.h b/cde/config/imake/imakemdep.h
index 44c5eb05b23cbbb5b1f62254834d1e7344ae9a1d..3a4614c83c93817fd7b82f311c46c1f8d1af426b 100644 (file)
--- a/cde/config/imake/imakemdep.h
+++ b/cde/config/imake/imakemdep.h
@@ -354,7 +354,7 @@ char *cpp_argv[ARGUMENTS] = {
         {"-D__powerpc64__", "1"},
 # endif
 
-# ifdef __GNUC__
+# if defined(__GNUC__) && !defined(__llvm__)
        "-traditional",
 # endif
 # ifdef __llvm__

diff --git a/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c b/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c
index 4f992f8068d48d0e19850b744fb0c9e7ca3da223..2310f696905d5fd9ab5692b6b149035f65f8f851 100644 (file)
--- a/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c
@@ -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 */

diff --git a/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c b/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c
index 4e348a1382471d87df8e308a360e461917e7be9a..3f72b64f6f5db46c365ab5ab6989e4cf5a4e93e9 100644 (file)
--- a/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c
@@ -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 */

diff --git a/cde/lib/DtTerm/TermPrim/TermPrimRenderLineDraw.c b/cde/lib/DtTerm/TermPrim/TermPrimRenderLineDraw.c
index 96cfd2a0381f4e811d2547fe62a5fa7055f0b672..b623419895b97abb319be1f1ae514463ded9a4c2 100644 (file)
--- a/cde/lib/DtTerm/TermPrim/TermPrimRenderLineDraw.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimRenderLineDraw.c
@@ -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"

diff --git a/cde/lib/DtWidget/Editor.c b/cde/lib/DtWidget/Editor.c
index d330e091024df8e5af12a7d1ead9fa289c570f4f..5f361721a07c0b273aefbcf7369e8fa085a15466 100644 (file)
--- a/cde/lib/DtWidget/Editor.c
+++ b/cde/lib/DtWidget/Editor.c
@@ -51,6 +51,7 @@
 */
 
 #include <ctype.h>
+#include <stdlib.h>
 
 #if defined(__hpux) || defined(__osf__) || defined(USL)
 # include <wchar.h> 

diff --git a/cde/programs/dthelp/parser/canon1/build/Imakefile b/cde/programs/dthelp/parser/canon1/build/Imakefile
index f93d2a136b3101971d93eaa177265ec6900ea64a..139167dae1e519cbd46ef67669557ed9d2b2e870 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/build/Imakefile
+++ b/cde/programs/dthelp/parser/canon1/build/Imakefile
@@ -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:

diff --git a/cde/programs/dthelp/parser/canon1/eltdef/Imakefile b/cde/programs/dthelp/parser/canon1/eltdef/Imakefile
index 4784b6a91bcf0d4916fc4cdf600e7b803a80da49..510235bb1bed2811b41d1f142075ff5a4aabfcba 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/eltdef/Imakefile
+++ b/cde/programs/dthelp/parser/canon1/eltdef/Imakefile
@@ -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:

diff --git a/cde/programs/dthelp/parser/canon1/parser/Imakefile b/cde/programs/dthelp/parser/canon1/parser/Imakefile
index c6390669dece99a6730f8fccc8b740ceb683d1c4..324c22d4c7a9fa5b179bcecb78b2583bfec24132 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/parser/Imakefile
+++ b/cde/programs/dthelp/parser/canon1/parser/Imakefile
@@ -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:

diff --git a/cde/programs/dthelp/parser/pass1/build/Imakefile b/cde/programs/dthelp/parser/pass1/build/Imakefile
index 7a7b587943be7dff8a84495ff239da2b0a654dcc..bbf6b43af20dc3ec820cb410bdb95080e96d3f38 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/build/Imakefile
+++ b/cde/programs/dthelp/parser/pass1/build/Imakefile
@@ -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:

diff --git a/cde/programs/dthelp/parser/pass1/eltdef/Imakefile b/cde/programs/dthelp/parser/pass1/eltdef/Imakefile
index 3f4a673fcfea3b06577b44bf90cd01520c3f84fa..c0a625780e6af7c64161ffb64cbb137f83d1eae4 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/eltdef/Imakefile
+++ b/cde/programs/dthelp/parser/pass1/eltdef/Imakefile
@@ -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:

diff --git a/cde/programs/dthelp/parser/pass1/parser/Imakefile b/cde/programs/dthelp/parser/pass1/parser/Imakefile
index e583464faeae4a63a2fe3eca47eb4c3b87229517..db1cc93dab34a6b4c3bf1241f224c5eb5a6b1d44 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/parser/Imakefile
+++ b/cde/programs/dthelp/parser/pass1/parser/Imakefile
@@ -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:

diff --git a/cde/programs/dthelp/parser/pass2/build/Imakefile b/cde/programs/dthelp/parser/pass2/build/Imakefile
index 29b19301fbfe74c003baa284484fc62a4a4c49e4..f3c5f2c54552915e3d7a3a7929f251510af48d4d 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/build/Imakefile
+++ b/cde/programs/dthelp/parser/pass2/build/Imakefile
@@ -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:

diff --git a/cde/programs/dthelp/parser/pass2/eltdef/Imakefile b/cde/programs/dthelp/parser/pass2/eltdef/Imakefile
index 8a245de2cccdbc7cf6e19307fd55147b404a9d28..96da1559cac772464e8f99173fec06a1b2b3bd13 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/eltdef/Imakefile
+++ b/cde/programs/dthelp/parser/pass2/eltdef/Imakefile
@@ -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:

diff --git a/cde/programs/dthelp/parser/pass2/parser/Imakefile b/cde/programs/dthelp/parser/pass2/parser/Imakefile
index 478758be16408b409d969b2c148ce54a7c596b66..701fe36528407a25565b15e94865406a8708e37a 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/parser/Imakefile
+++ b/cde/programs/dthelp/parser/pass2/parser/Imakefile
@@ -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:

diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C
index e4c043907f5a2c5d002c02dc6362c44b15abd3dd..d2cc89864293ddda5d701368d337bf0db8d59299 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.C
@@ -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

diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/TextParser.C b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/TextParser.C
index 67af02cbaf458d637b5dde84f652e7cad507e5e7..9c02b128e89936f29c9b4ffaebf78ac2e7e7ffa0 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/TextParser.C
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/TextParser.C
@@ -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];

diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchStorage.h b/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchStorage.h
index bdfcd085e6f2ab68e917e1d806ac264d630bb6ef..dcbabff9032f67b40c2c134ef4ebf7b0bb709505 100644 (file)
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchStorage.h
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchStorage.h
@@ -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>