Fix warnings on FreeBSD

cde/programs/dtappbuilder/src/abmf/obj_namesP.h

@@ -43,7 +43,7 @@
 /*
  * obj_namesP.h - C/Widget/other names for objects
  */
-#ifndef _ABMF_OBJ_NAMES__H_
+#ifndef _ABMF_OBJ_NAMESP_H_
 #define _ABMF_OBJ_NAMESP_H_
 
 #include "write_codeP.h"

cde/programs/dtappbuilder/src/libABobj/obj_notifyP.h

@@ -45,7 +45,7 @@
  *
   * Internal files - defines internal data structures, et cetera
  */
-#ifndef _ABOBJ_NOTIFYP_H
+#ifndef _ABOBJ_NOTIFYP_H_
 #define _ABOBJ_NOTIFYP_H_
 
 #include "objP.h"		/* include before obj.h! */

cde/programs/dtcm/libDtCmP/getdate.h

@@ -52,7 +52,7 @@
 #ifndef _GETDATE_H
 #define _GETDATE_H
 
-#if defined(USG) || defined(__OpenBSD__)
+#if defined(USG) || defined(CSRG_BASED)
 struct timeb
 {
         time_t  time;

cde/programs/dtcm/libDtCmP/util.c

@@ -61,6 +61,8 @@
 #include <sys/utsname.h> /* SYS_NMLN */
 #if defined(sun)
 #include <sys/systeminfo.h>
+#elif defined(CSRG_BASED)
+#include <sys/dirent.h>
 #else
 #include <sys/dir.h>
 #endif /* sun */

cde/programs/dthelp/parser/canon1/util/entdef.h

@@ -30,6 +30,9 @@
 #define M_ENDTAG 3
 #define M_MD 4
 #define M_MS 5
+#ifdef  M_PI
+#undef  M_PI
+#endif
 #define M_PI 6
 #define M_CDATAENT 7
 #define M_SDATA 8

cde/programs/dthelp/parser/pass1/util/entdef.h

@@ -30,6 +30,9 @@
 #define M_ENDTAG 3
 #define M_MD 4
 #define M_MS 5
+#ifdef  M_PI
+#undef  M_PI
+#endif
 #define M_PI 6
 #define M_CDATAENT 7
 #define M_SDATA 8

cde/programs/dthelp/parser/pass2/util/entdef.h

@@ -30,6 +30,9 @@
 #define M_ENDTAG 3
 #define M_MD 4
 #define M_MS 5
+#ifdef  M_PI
+#undef  M_PI
+#endif
 #define M_PI 6
 #define M_CDATAENT 7
 #define M_SDATA 8

cde/programs/dtinfo/DtMmdb/HardCopy/HardCopyFP.C

@@ -63,7 +63,7 @@ const char* loutFeatureProcessor::convertToLiteral(const char* str)
         if ( literalBufferSize < 2*size + 3 ) {
            literalBufferSize = 2*size + 3;
            literalBufferSize *= 2;
-           delete literalBuffer;
+           delete [] literalBuffer;
            literalBuffer = new  char[literalBufferSize];
         }    
 

cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C

@@ -47,7 +47,7 @@ static ostrstream& terminate(ostrstream& ost)
 #endif
 
 DocParser::DocParser(Resolver &r)
-: f_resolver(r), f_ignoring_element(0),
+: f_ignoring_element(0), f_resolver(r),
 #if defined(SC3)
   f_buffer(new char[DATA_BUF_SIZ]),
   f_output(f_buffer, DATA_BUF_SIZ)

cde/programs/dtinfo/DtMmdb/StyleSheet/defParser.C

@@ -22,6 +22,7 @@
  */
 // $TOG: defParser.C /main/5 1997/12/23 11:16:25 bill $
 #ifndef lint
+__attribute__((unused))
 static const char defParsersccsid[] = "@(#)yaccpar	1.8 (Berkeley) 01/20/90";
 #endif
 #define defParserBYACC 1

cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C

@@ -235,7 +235,7 @@ void addToDefTokenStringBuf(const unsigned char* str, int size)
       defToken_string_buf_size = 2*(size+defToken_string_buf_content_size);
       unsigned char* x = new unsigned char[defToken_string_buf_size];
       memcpy(x, defToken_string_buf, defToken_string_buf_content_size);
-      delete defToken_string_buf;
+      delete [] defToken_string_buf;
       defToken_string_buf = x;
    }
 

cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.l

@@ -51,7 +51,7 @@ void addToDefTokenStringBuf(const unsigned char* str, int size)
       defToken_string_buf_size = 2*(size+defToken_string_buf_content_size);
       unsigned char* x = new unsigned char[defToken_string_buf_size];
       memcpy(x, defToken_string_buf, defToken_string_buf_content_size);
-      delete defToken_string_buf;
+      delete [] defToken_string_buf;
       defToken_string_buf = x;
    }
 

cde/programs/dtinfo/DtMmdb/StyleSheet/style.C

@@ -22,6 +22,7 @@
  */
 // $TOG: style.C /main/6 1998/04/17 11:51:49 mgreess $
 #ifndef lint
+__attribute__((unused))
 static const char stylesccsid[] = "@(#)yaccpar	1.8 (Berkeley) 01/20/90";
 #endif
 #define styleBYACC 1

cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C

@@ -263,7 +263,7 @@ void addToQstringBuf(const unsigned char* str, int size)
       qstring_buf_size = 2*(size+qstring_buf_content_size);
       unsigned char* x = new unsigned char[qstring_buf_size];
       memcpy(x, qstring_buf, qstring_buf_content_size);
-      delete qstring_buf;
+      delete [] qstring_buf;
       qstring_buf = x;
    }
 
@@ -699,7 +699,7 @@ case 2:
 # line 99 "tokenStyle.l"
 {
 	   if ( commentBufferSize < styleleng ) {
-              delete commentBuffer;
+              delete [] commentBuffer;
               commentBufferSize = 2 * styleleng ;
               commentBuffer = new char [commentBufferSize];
            } 

cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.l

@@ -77,7 +77,7 @@ void addToQstringBuf(const unsigned char* str, int size)
       qstring_buf_size = 2*(size+qstring_buf_content_size);
       unsigned char* x = new unsigned char[qstring_buf_size];
       memcpy(x, qstring_buf, qstring_buf_content_size);
-      delete qstring_buf;
+      delete [] qstring_buf;
       qstring_buf = x;
    }
 
@@ -98,7 +98,7 @@ unit ([Ii][Nn]|[Ii][Nn][Cc][Hh]|[Pp][Cc]|[Pp][Ii][Cc][Aa]|[Pp][Tt]|[Pp][Oo][Ii][
 
 ^"#".*	{
 	   if ( commentBufferSize < yyleng ) {
-              delete commentBuffer;
+              delete [] commentBuffer;
               commentBufferSize = 2 * yyleng ;
               commentBuffer = new char [commentBufferSize];
            } 

cde/programs/dtinfo/DtMmdb/compression/code.C

@@ -51,7 +51,7 @@
 #include "compression/code.h"
 
 encoding_unit::encoding_unit(ostring* w, unsigned int f) :
-   word(w), freq(f), code(0), bits(0), leaf_htr_node(NULL)
+   word(w), bits(0), freq(f), code(0), leaf_htr_node(NULL)
 {
 }
 

cde/programs/dtinfo/DtMmdb/dti_excs/Exception.C

@@ -40,7 +40,7 @@ char *Exception::g_next_avail = Exception::g_temp_space;
 // /////////////////////////////////////////////////////////////////
 
 Exception::Exception()
-: f_thrown(0), f_thrown_as_pointer(1), f_temporary(0), f_line(0), f_file(NULL), f_previous_exception(NULL)
+: f_thrown(0), f_thrown_as_pointer(1), f_temporary(0), f_file(NULL), f_line(0), f_previous_exception(NULL)
 {
   PRINTF (("Constructed Exception obj @ %p\n", this));
 }

cde/programs/dtinfo/DtMmdb/object/oid_list.C

@@ -439,7 +439,7 @@ io_status oid_list::asciiIn(istream& in)
       list_ptr.p -> set(oid_array, v_sz);
    }
 
-   delete oid_array;
+   delete [] oid_array;
 
    return done;
 }

cde/programs/dtinfo/DtMmdb/schema/sheet.C

@@ -22,6 +22,7 @@
  */
 // $TOG: sheet.C /main/4 1997/12/23 11:20:35 bill $
 #ifndef lint
+__attribute__((unused))
 static const char schemasccsid[] = "@(#)yaccpar	1.8 (Berkeley) 01/20/90";
 #endif
 #define  schemaBYACC 1

cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.hh

@@ -57,9 +57,9 @@ public:
   BookmarkEdit (UAS_Pointer<Mark> &mark)
     : f_mark_ptr (mark),
       f_shell (NULL),
-      f_modified (FALSE),
       f_name_text(NULL),
       f_notes_text(NULL),
+      f_modified (FALSE),
       f_wm_delete_callback(NULL)
     {
       MarkMgr::request ((UAS_Receiver<MarkMoved> *) this);

cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C

@@ -118,15 +118,15 @@ GraphicAgent::GraphicAgent (UAS_Pointer<UAS_Common> &node_ptr,
 : f_shell (NULL),
   f_node_ptr(node_ptr),
   f_graphic (gr),
-  f_panner_state (PANNER_NONE),
-  f_current_scale (100),
-  f_scale_button(NULL),
-  f_setcustom(0),
   f_panner(NULL),
   f_pixmap_widget(NULL),
+  f_panner_state (PANNER_NONE),
+  f_current_scale (100),
   f_view_menu(NULL),
   f_message_area(NULL),
-  f_custom_scale(NULL)
+  f_scale_button(NULL),
+  f_custom_scale(NULL),
+  f_setcustom(0)
 
 {
   f_graphic->pixmap_graphic()->agent(this);

cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.hh

@@ -152,14 +152,13 @@ private: // variables
 inline
 LibraryAgent::LibraryAgent()
 : f_shell (NULL),
+  f_doc_tree_view(),
   f_oe (NULL),
   f_keep_forever (FALSE),
   f_wm_delete_callback (NULL),
   f_tracking_hierarchy (NULL),
   f_popped_down (TRUE),
   f_close (NULL),
-  f_close_sensitive (FALSE),
-  f_doc_tree_view(),
   f_copy(NULL),
   f_detach(NULL),
   f_detach2(NULL),
@@ -171,6 +170,7 @@ LibraryAgent::LibraryAgent()
   f_remove(NULL),
   f_remove2(NULL),
   f_auto_track(NULL),
+  f_close_sensitive (FALSE),
   f_status_text(NULL),
   f_scope_menu(NULL)
   

cde/programs/dtinfo/dtinfo/src/Agents/MapAgentMotif.C

@@ -219,15 +219,15 @@ MapButton::destroy()
 // /////////////////////////////////////////////////////////////////
 
 MapAgent::MapAgent()
-: f_shell (NULL),
-  f_onscreen (FALSE),
-  f_locked(FALSE),
+: f_locked(FALSE),
   f_map_mode(LOCAL_MODE),
+  f_shell (NULL),
   f_porthole(NULL),
   f_panner(NULL),
   f_tree(NULL),
   f_wm_delete_callback(NULL),
   f_lock(NULL),
+  f_onscreen (FALSE),
   f_min_tree_width(0),
   f_min_tree_height(0)
 {

cde/programs/dtinfo/dtinfo/src/Agents/MarkChooser.C

@@ -84,8 +84,8 @@
 MarkChooser::MarkChooser (Widget parent, xList<MarkCanvas *> &marks,
 			  const char *title_key, const char *ok_key)
 : f_selected_item (-1),
-  f_mark_list (&marks),
-  f_done(FALSE)
+  f_done(FALSE),
+  f_mark_list (&marks)
 {
     create_ui (parent, title_key, ok_key);
     update_list();

cde/programs/dtinfo/dtinfo/src/Agents/MarkListView.C

@@ -81,9 +81,9 @@
 // /////////////////////////////////////////////////////////////////
 
 MarkListView::MarkListView()
-: f_shell (NULL),
-  f_popped_up (FALSE),
-  f_selected_item(0)
+: f_selected_item(0),
+  f_shell (NULL),
+  f_popped_up (FALSE)
 {
 }
 

cde/programs/dtinfo/dtinfo/src/Agents/MessageAgentMotif.hh

@@ -94,8 +94,8 @@ private: // variables
 inline
 MessageAgent::MessageAgent()
 : f_dialog (NULL),
-  f_exit_flag (False),
   f_text(NULL),
+  f_exit_flag (False),
   f_real_parent(NULL),
   f_popped_up(FALSE),
   f_pressed_ok(FALSE)

cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C

@@ -778,16 +778,6 @@ NodeWindowAgent::NodeWindowAgent (u_int serial_no)
   f_shell (NULL),
   f_help_dsp_area (NULL),
   f_close(NULL),
-  f_current_ancestor (NULL),
-  f_form(NULL),
-  f_preview_timeout (NULL),
-  f_serial_number(serial_no),
-  f_history_display (FALSE),
-  f_vscrollbar_offset(0),
-  f_hscrollbar_offset(0),
-  f_graphic_segment(NULL),
-  f_graphics_handler(NULL),
-  f_close_sensitive(FALSE),
   f_frame(NULL),
   f_create_bmrk(NULL),
   f_create_anno(NULL),
@@ -810,10 +800,20 @@ NodeWindowAgent::NodeWindowAgent (u_int serial_no)
   f_print(NULL),
   f_print2(NULL),
   f_print_as(NULL),
+  f_current_ancestor (NULL),
+  f_form(NULL),
   f_move_mark_sensitive(0),
   f_last_access_time(0),
   f_locked(FALSE),
-  f_wm_delete_callback(NULL)
+  f_wm_delete_callback(NULL),
+  f_preview_timeout (NULL),
+  f_serial_number(serial_no),
+  f_history_display (FALSE),
+  f_vscrollbar_offset(0),
+  f_hscrollbar_offset(0),
+  f_graphic_segment(NULL),
+  f_graphics_handler(NULL),
+  f_close_sensitive(FALSE)
   
 {
     UAS_Common::request ((UAS_Receiver<UAS_LibraryDestroyedMsg> *) this);

cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C

@@ -151,9 +151,8 @@ static Boolean print_hierarchy;  // keep track of hierarchy vs section
 
 #if 0 && defined(PRINTING_SUPPORTED)
 static void PrintEverything(AppPrintData *p);
-#endif  /* PRINTING_SUPPORTED */
-
 static void PrintOneUASCommon(UAS_Pointer<UAS_Common> &doc, Widget pshell, int *cur_pageP);
+#endif  /* PRINTING_SUPPORTED */
 
 PrintPanelAgent::PrintPanelAgent()
 {
@@ -963,7 +962,6 @@ PrintEverything(AppPrintData *p)
 
     RCS_DEBUG("PrintEverything exiting.\n");
 }
-#endif  /* PRINTING_SUPPORTED */
 
 static void
 PrintOneUASCommon(UAS_Pointer<UAS_Common> &doc, Widget pshell, int *cur_pageP)
@@ -1030,6 +1028,7 @@ PrintOneUASCommon(UAS_Pointer<UAS_Common> &doc, Widget pshell, int *cur_pageP)
 	}
     }
 }
+#endif  /* PRINTING_SUPPORTED */
 
 /*
  * ------------------------------------------------------------------------

cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.hh

@@ -115,9 +115,9 @@ protected: // variables
 
 inline
 SearchResultsAgent::SearchResultsAgent()
-: f_work_proc_id (0), f_popped_up(FALSE), f_my_ale(NULL), f_retain(FALSE),
-  f_results(NULL), f_selected_item(0), f_retain_toggle(NULL), f_query_text(NULL),
-  f_hits_label(NULL), f_scope_label(NULL), f_docs_to_display(0), f_count(0),
-  f_scale(0), f_header_indent(0)
+: f_my_ale(NULL), f_retain(FALSE), f_results(NULL), f_selected_item(0),
+  f_retain_toggle(NULL), f_query_text(NULL), f_hits_label(NULL),
+  f_scope_label(NULL), f_docs_to_display(0), f_count(0), f_scale(0),
+  f_work_proc_id(0), f_popped_up(FALSE), f_header_indent(0)
 {
 }

cde/programs/dtinfo/dtinfo/src/Basic/Buffer.hh

@@ -75,8 +75,8 @@ public:
 
   void write (const int integer);
 
-  void write (const size_t integer)
-    { write ((size_t) ((void *) integer)); }
+  void write (const unsigned int integer)
+    { write ((int) (integer)); }
 
   void write (const char *string);
   void write (const char *bytes, u_int size, u_int length);

cde/programs/dtinfo/dtinfo/src/Basic/List.C

@@ -121,8 +121,6 @@ List::append (FolioObject &element)
   check_space();
 
   /* -------- Add the element. -------- */
-  if (&element == NULL)
-    abort();
   f_list_element[f_length] = &element;
   f_length++;
   notify (APPENDED, (void *)(size_t) (f_length - 1));

cde/programs/dtinfo/dtinfo/src/Managers/ServiceMgrX.C

@@ -429,7 +429,7 @@ olias_send_event (Widget, OliasEvent *event)
 		    if (locator == NULL)
 		      return (OLIAS_TIMEOUT);
 		    ON_DEBUG(printf(">>> g_top_locator = %p\n", g_top_locator));
-		    if (g_top_locator == NULL)
+		    if (g_top_locator[0] == '\0')
 		      return (OLIAS_TIMEOUT);
                     g_scroll_to_locator = TRUE;
                     len = MIN(strlen(locator), 4096 - 1);

cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.C

@@ -231,16 +231,16 @@ print_justify (unsigned value)
 
 CanvasRenderer::CanvasRenderer(int font_scale)
 : Renderer(),
+  f_vcc(0),
+  f_current_container(NULL),
+  f_current_displayable(NULL),
   f_current_tgroup (0),
   f_font (0),
   f_link_idx (-1),
   f_font_scale(font_scale),
+  f_default_features(NULL),
   fBogusSymbol(gElemSymTab->intern("%BOGUS")),
-  f_level(0),
-  f_vcc(0),
-  f_current_container(NULL),
-  f_current_displayable(NULL),
-  f_default_features(NULL)
+  f_level(0)
 {
   // make symbols 
   for ( int i=0; i < REND_SYMBOLS; i++)
@@ -2534,7 +2534,7 @@ TGDefn::build()
       delete grid[r] ;		// clean up column memory
     }
 
-  delete grid ;			
+  delete [] grid ;
 
   // now  apply the formats to the _DtCvTable
   { 

cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C

@@ -226,8 +226,8 @@ public:
   Shell_Info (Widget w)
     : f_shell (w),
       f_size_hints (NULL),
-      f_restore (False),
       f_has_size_hints(False),
+      f_restore (False),
       f_iconic(False),
       f_has_wm_state(False)
     { }
@@ -247,22 +247,22 @@ public:
 // /////////////////////////////////////////////////////////////////
 
 WindowSystem::WindowSystem (int &argc, char *argv[])
-: f_printing(False),
+: f_print_display(NULL),
+  f_printing(False),
   f_default_pixmap (0),
+  f_default_print_pixmap(0),
   f_defpix_width (0),
   f_defpix_height (0),
-  f_detached_pixmap(0),
-  f_shell_list (20),
-  f_cursor_stack_pos(-1),
-  f_dtinfo_font(NULL),
-  f_dtinfo_space_font(NULL),
-  f_print_display(NULL),
-  f_default_print_pixmap(0),
   f_print_defpix_width(0),
   f_print_defpix_height(0),
+  f_detached_pixmap(0),
   f_detached_width(0),
   f_detached_height(0),
-  f_print_screen(NULL)
+  f_shell_list (20),
+  f_cursor_stack_pos(-1),
+  f_print_screen(NULL),
+  f_dtinfo_font(NULL),
+  f_dtinfo_space_font(NULL)
 {
   f_argc = &argc;
   f_argv = argv;

cde/programs/dtinfo/dtinfo/src/Query/QueryEditor.C

@@ -105,8 +105,8 @@ QueryEditor::QueryEditor(UAS_SearchEngine& search_engine)
 : f_query (NULL),
   f_query_view (NULL),
   f_shell (NULL),
-  f_null_terms (0),
-  f_min_term_width(0)
+  f_min_term_width(0),
+  f_null_terms (0)
 {
   f_query_editor = this;
 

cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.C

@@ -60,12 +60,14 @@ using namespace std;
 #include "dbug.h"  /* ala Fred Fish's dbug package from uunet */
 #endif
 
+#ifdef LICENSE_MANAGEMENT
 const int A_FEATURE = OLAF::Feature;
 const int A_VEN_CODE = OLAF::VenCode;
 const int A_VERSION  = OLAF::Version;
 const int A_GROUPING = OLAF::Grouping;
 const int A_DEMO_TERMS = OLAF::DemoTerms;
 const int A_DEFAULT_SECTION = OLAF::DefaultSection;
+#endif
 
 /***********************************
  *

cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.C

@@ -22,6 +22,7 @@
  */
 /* $TOG: OL_DataExpr.C /main/4 1997/12/23 11:38:27 bill $ */
 #ifndef lint
+__attribute__((unused))
 static const char ol_datasccsid[] = "@(#)yaccpar	1.8 (Berkeley) 01/20/90";
 #endif
 #define ol_dataBYACC 1

cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c

@@ -37,7 +37,7 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
-# include <libgen.h> /* for dirname() */
+#include <libgen.h> /* for dirname() */
 #include <ctype.h>
 #include <signal.h>
 #if !defined(CSRG_BASED)
@@ -235,7 +235,7 @@ static char *buildSpec(void);
 static void defaultGlobals(void);
 static void checkGlobals(void);
 static int parseArgs(int argc, char *argv[]);
-static char *parseDocument(Boolean runCmd, ...);
+static char *parseDocument(int runCmd, ...);
 static void buildBookcase(char *cmdSrc, char *dirName);
 static char *storeBookCase(char *cmdSrc, char *tocOpt, char *dbName,
 			   char *dirName);
@@ -1355,7 +1355,7 @@ parseArgs(int argc, char *argv[])
 }
 
 static char *
-parseDocument(Boolean runCmd, ...)
+parseDocument(int runCmd, ...)
 {
     va_list ap;
     char *ptr;

cde/programs/dtlogin/vgmain.c

@@ -2222,7 +2222,6 @@ DebugWidgetResources(Widget w)
     XtGetValues(w, argt, i);
 }
 
-/*
 /***************************************************************************
  *
  * GetDisplayName (void) - transform the display name into a "short"

cde/programs/dtprintinfo/Imakefile

@@ -1,7 +1,7 @@
 XCOMM $TOG: Imakefile /main/21 1998/08/25 12:58:41 mgreess $
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #define IHaveSubdirs

cde/programs/dtprintinfo/UI/Imakefile

@@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/04/21 19:50:41 drk $
 #define LibInstall	NO
  
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 INCLUDES = -I. -I.. -I../libUI -I../libUI/MotifUI -I../objects -I../util -I../objects -I../objects/PrintObj
 

cde/programs/dtprintinfo/libUI/Imakefile

@@ -1,7 +1,7 @@
 XCOMM $TOG: Imakefile /main/14 1998/08/25 12:59:12 mgreess $
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #define IHaveSubdirs

cde/programs/dtprintinfo/objects/PrintObj/Imakefile

@@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:52:17 drk $
 #define LibInstall	NO
  
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 INCLUDES = -I. -I.. -I../.. -I../../util
 

cde/programs/dtprintinfo/util/Imakefile

@@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:50:47 drk $
 #define LibInstall	NO
  
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 INCLUDES = -I.
 

cde/programs/dtsearchpath/dtsp/InfoLibSearchPath.C

@@ -20,7 +20,7 @@
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
-/* $TOG: InfoLibSearchPath.C /main/5 1998/08/17 10:33:55 mgreess $
+/* $TOG: InfoLibSearchPath.C /main/5 1998/08/17 10:33:55 mgreess $ */
 /*
  * (c) Copyright 1996 Digital Equipment Corporation.
  * (c) Copyright 1996 Hewlett-Packard Company.

cde/programs/dtstyle/ColorFile.c

@@ -50,7 +50,7 @@
 #ifdef __hpux
 #include <ndir.h>               /*   opendir(), directory(3C) */
 #else
-#if SVR4 || sco
+#if defined(SVR4) || defined(sco) || defined(CSRG_BASED)
 #include <dirent.h>             /* opendir(), directory(3C) */
 #else
 #include <sys/dir.h>

cde/programs/dtudcfonted/libfal/include/os.h

@@ -99,6 +99,9 @@ pragma on(alloca);
 
 #if defined(__GNUC__)
 #if !defined(__linux__)
+#ifdef alloca
+#undef alloca
+#endif
 #define alloca ___builtin_alloca
 #endif
 #define ALLOCATE_LOCAL(size) alloca((int)(size))

cde/programs/ttsnoop/Imakefile

@@ -5,7 +5,7 @@ UTILLIB = -lutil
 #endif  /* BSDArchitecture */
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 INCLUDES = $(TIRPCINC)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)