lots of semantic sugar, do things the 4BSD way... ;-}

[unix-history] / usr / src / include / disktab.h

diff --git a/usr/src/include/disktab.h b/usr/src/include/disktab.h
index 7677121..1d0f6b5 100644 (file)
--- a/usr/src/include/disktab.h
+++ b/usr/src/include/disktab.h
@@ -1,22 +1,15 @@
 /*
 /*

- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)disktab.h   5.3 (Berkeley) %G%
+ *     @(#)disktab.h   8.1 (Berkeley) %G%

  */
 
  */
 

+#ifndef        _DISKTAB_H_
+#define        _DISKTAB_H_
+

 /*
  * Disk description table, see disktab(5)
  */
 /*
  * Disk description table, see disktab(5)
  */


@@ -39,4 +32,4 @@ struct        disktab {
        } d_partitions[8];
 };
 
        } d_partitions[8];
 };
 

-struct disktab *getdiskbyname();
+#endif /* !_DISKTAB_H_ */