Fix merge conflicts

[bsdgames-darwin.git] / warp / intrp.h

diff --git a/warp/intrp.h b/warp/intrp.h
index fd5c57ad362b0617d75fdee41317b37491e15444..524f72431d8b1cd503fccf89238476d96b49ef05 100644 (file)
--- a/warp/intrp.h
+++ b/warp/intrp.h
@@ -3,21 +3,20 @@
  * Log:        intrp.h,v
  * Revision 7.0.1.1  86/12/12  16:59:45  lwall
  * Baseline for net release.
- * 
+ *
  * Revision 7.0  86/10/08  15:12:27  lwall
  * Split into separate files.  Added amoebas and pirates.
- * 
+ *
  */
 
-EXT char *origdir INIT(Nullch);                /* cwd when warp invoked */
-EXT char *homedir INIT(Nullch);                /* login directory */
-EXT char *dotdir INIT(Nullch);         /* where . files go */
-EXT char *logname INIT(Nullch);                /* login id */
+EXT char *origdir INIT(NULL);          /* cwd when warp invoked */
+EXT char *homedir INIT(NULL);          /* login directory */
+EXT char *dotdir INIT(NULL);           /* where . files go */
+EXT char *logname INIT(NULL);          /* login id */
 EXT char *hostname;    /* host name */
-EXT char *realname INIT(Nullch);       /* real name from /etc/passwd */
+EXT char *realname INIT(NULL); /* real name from /etc/passwd */
 
-void    intrp_init();
-char   *filexp();
-char   *dointerp();
-void   interp();
-char   *getrealname();
+void intrp_init(char *);
+char *filexp(const char *);
+void interp(char *, size_t, const char *);
+char *dointerp(char *, size_t, const char *, const char *);