nsgml: Resolve symbol collision when building with SunStudio 12.1

[oweals/cde.git] / cde / programs / dtfile / ChangeDirP.c

diff --git a/cde/programs/dtfile/ChangeDirP.c b/cde/programs/dtfile/ChangeDirP.c
index 8c699cb444816f3f312ed6517c343ca17b739e66..cbe885e222622454eb64b5553b809acfe8adff7e 100644 (file)
--- a/cde/programs/dtfile/ChangeDirP.c
+++ b/cde/programs/dtfile/ChangeDirP.c
@@ -1,3 +1,25 @@
+/*
+ * CDE - Common Desktop Environment
+ *
+ * Copyright (c) 1993-2012, The Open Group. All rights reserved.
+ *
+ * These libraries and programs are free software; you can
+ * redistribute them and/or modify them under the terms of the GNU
+ * Lesser General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * These libraries and programs are distributed in the hope that
+ * they will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with these libraries and programs; if not, write
+ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110-1301 USA
+ */
 /* $TOG: ChangeDirP.c /main/8 1998/04/01 15:05:07 rafi $ */
 /************************************<+>*************************************
  ****************************************************************************
@@ -39,9 +61,11 @@
 #include <limits.h>
 #include <Xm/Xm.h>
 #include <Xm/XmP.h>
+#include <Xm/DrawP.h>
 #include <Xm/TextFP.h>
 #include <Xm/PushBG.h>
 #include <Xm/DragDrop.h>
+#include <Xm/RowColumn.h>
 #include <Dt/Icon.h>
 #include <Dt/IconP.h>
 #include <Dt/DtNlUtils.h>
@@ -280,7 +304,7 @@ ShowChangeDirDialog(
 
    if (w)
    {
-      if((int)client_data == FM_POPUP)
+      if((XtArgVal)client_data == FM_POPUP)
          mbar = XtParent(w);
       else
          mbar = (Widget) XmGetPostedFromWidget(XtParent(w));
@@ -580,7 +604,7 @@ CurrentDirDropCallback(
 /************************************************************************
  *
  *  CurrentDirIconCallback
- *     Callback function invoked upon an action occuring on an icon.
+ *     Callback function invoked upon an action occurring on an icon.
  *
  ************************************************************************/
 
@@ -768,7 +792,7 @@ GetStatusMsg(
        file_mgr_data->busy_status == busy_readdir)
    {
       if (file_mgr_data->busy_detail == 0)
-         sprintf (buf, (GETMESSAGE(3,5, "Reading ...")));
+         sprintf (buf, "%s", (GETMESSAGE(3,5, "Reading ...")));
       else if (file_mgr_data->busy_detail == 1)
         sprintf (buf, (GETMESSAGE(3,11, "%d Item(s)...")),
                  file_mgr_data->busy_detail);