Fix merge conflicts

[bsdgames-darwin.git] / sail / driver.h

diff --git a/sail/driver.h b/sail/driver.h
index 9f487389abaa25de2c1703ee4f901701d33fc316..422cddfdcfa00c3e7f92f5c12f7f595b9db7ff2e 100644 (file)
--- a/sail/driver.h
+++ b/sail/driver.h
@@ -1,6 +1,8 @@
+/*     $NetBSD: driver.h,v 1.8 2003/08/07 09:37:42 agc Exp $   */
+
 /*
- * Copyright (c) 1983 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, with or without
  * modification, are permitted provided that the following conditions
@@ -10,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -30,9 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     @(#)driver.h    5.4 (Berkeley) 6/1/90
+ *     @(#)driver.h    8.2 (Berkeley) 5/3/95
  */
 
-#include "externs.h"
-
-int dtab[];
+extern const int dtab[];