Merge branch 'master' into cde-next

[oweals/cde.git] / cde / programs / dtfile / Main.h

diff --git a/cde/programs/dtfile/Main.h b/cde/programs/dtfile/Main.h
index 08b4ffc33be287370533dd66d2ad4cf5a0a1ac9f..0fb5ed8ab77d40bd4fe085e9820b460db31241b2 100644 (file)
--- a/cde/programs/dtfile/Main.h
+++ b/cde/programs/dtfile/Main.h
@@ -624,10 +624,10 @@ extern void AddString(
 /* prototype from MakeDir.c */
 
 extern int RunFileCommand(
-                        register char *command_path,
-                        register char *argument1,
-                        register char *argument2,
-                        register char *argument3) ;
+                        char *command_path,
+                        char *argument1,
+                        char *argument2,
+                        char *argument3) ;
 
 /* prototypes from Directory.h */
 
@@ -960,8 +960,8 @@ extern void FileOperationError(
 extern Boolean FileManip(
                         Widget w,
                         int mode,
-                        register char *from,
-                        register char *to,
+                        char *from,
+                        char *to,
                         Boolean isContainer,
                         void (*errorHandler)(),
                         Boolean checkForBusyDir,
@@ -971,7 +971,7 @@ extern int CheckAccess(
                         int what);
 
 extern char * DName(
-                        register char *name) ;
+                        char *name) ;
 
 /* prototypes from FileMgr.h */
 
@@ -1615,11 +1615,7 @@ extern Pixmap _DtGetPixmap(
  */
 
 #ifndef NO_MESSAGE_CATALOG
-# ifdef __ultrix
-#  define _CLIENT_CAT_NAME "dtfile.cat"
-# else  /* __ultrix */
-#  define _CLIENT_CAT_NAME "dtfile"
-# endif /* __ultrix */
+# define _CLIENT_CAT_NAME "dtfile"
 extern char *_DtGetMessage(char *filename, int set, int n, char *s);
 # define GETMESSAGE(set, number, string)\
     (_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))