935d0975b6
Yes, there will be conflicts on just about every file. There is a significant mainline after the initial import, and the "-j" merge conflicts on the $Id$ lines... Yuck! (These comments apply to the rest of the imports) Obtained from: Paul Vixie <paul@vix.com>
20 lines
349 B
C
20 lines
349 B
C
/* named.h - include the local definitions in the right order
|
|
* vix 28aug93 [original]
|
|
*
|
|
* $Id: named.h,v 1.1 1993/09/08 04:57:40 vixie Exp $
|
|
*/
|
|
|
|
#include "options.h"
|
|
#include "portability.h"
|
|
|
|
#include "pathnames.h"
|
|
|
|
#include "ns_defs.h"
|
|
#include "db_defs.h"
|
|
|
|
#include "ns_glob.h"
|
|
#include "db_glob.h"
|
|
|
|
#include "ns_func.h"
|
|
#include "db_func.h"
|