dthelp: Change to ANSI function definitions

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

diff --git a/cde/programs/dtfile/FileManip.c b/cde/programs/dtfile/FileManip.c
index 9bb95f78518b89a0e3955cb0e483cd21f3d054da..105c574bcb855da2a403fbe61e854a95dcaba75a 100644 (file)
--- a/cde/programs/dtfile/FileManip.c
+++ b/cde/programs/dtfile/FileManip.c
@@ -55,7 +55,7 @@
 #    include <sys/fs/ufs_fs.h>
 #    define ROOTINO UFSROOTINO
 #else
-#  if defined(linux) || defined(CSRG_BASED)
+#  if defined(__linux__) || defined(CSRG_BASED)
 #    define ROOTINO 2
 #  endif
 #  include <sys/param.h>
@@ -79,12 +79,6 @@
 #include <ufs/fs.h>
 #endif
 #else
-#ifdef __hp_osf
-#include <unistd.h>
-#include <limits.h>
-#include <ufs/fs.h>
-#include <sys/access.h>
-#else
 #ifdef __ultrix
 #include <unistd.h>
 #include <limits.h>
@@ -96,13 +90,8 @@
 #include <unistd.h>
 #endif
 #endif /* __ultrix */
-#endif /* __hp_osf */
 #endif /* sun */
 
-#ifdef __osf__
-#include <ufs/fs.h>
-#endif
-
 #include <Xm/Xm.h>
 
 #include <Xm/MwmUtil.h>
@@ -145,9 +134,9 @@ CheckAccess(
     uid_t save_ruid;
     gid_t save_rgid;
 
-#if defined(__hp_osf) || defined(__ultrix)
+#if defined(__ultrix)
 /*--------------------------------------------------------------------
- * access code for __hp_osf, __ultrix
+ * access code for __ultrix
  *------------------------------------------------------------------*/
 
       setreuid(geteuid(),-1);
@@ -192,7 +181,7 @@ CheckAccess(
 
    return access_priv;
 #endif /* BLS */
-#endif /* Apollo & OSF */
+#endif /* Apollo */
 }
 
 
@@ -986,7 +975,7 @@ FileManip(
    if (lstat (to, &s2) >= 0)                      /* <to> exists */
    {
       if ((stat (to, &s3) >= 0) &&
-#if defined(__hp_osf) || (__ultrix) || defined(__osf__) || defined(linux) || \
+#if defined(__ultrix) || defined(__linux__) || \
        defined(CSRG_BASED)
            (((s3.st_mode & S_IFMT) == S_IFDIR)          /* if is a directory */
            || ((s3.st_mode & S_IFMT) == S_IFSOCK)) )    /* or a net special */
@@ -1307,7 +1296,7 @@ FileManip(
            else
              tmpStr = (GETMESSAGE(11,54, "The move of the file/folder failed\ndue to some internal error. The internal\nerror given is:"));
            catmsg = XtNewString(tmpStr);
-           tmpStr = (GETMESSAGE(11,55, "Please see your System Adminstrator"));
+           tmpStr = (GETMESSAGE(11,55, "Please see your System Administrator"));
            samsg = XtNewString(tmpStr);
          }