Sync with HEAD

[openldap] / include / lber_types.h.in

diff --git a/include/lber_types.h.in b/include/lber_types.h.in
index 218202e685fbeec5f47abff3d5646cce659be5fe..cae4a09d72dce3ac5bdd95179dae2b38b9f73a3b 100644 (file)
--- a/include/lber_types.h.in
+++ b/include/lber_types.h.in
@@ -1,16 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
-#include <ldap_cdefs.h>
-
 /*
  * LBER types
  */
@@ -18,6 +20,8 @@
 #ifndef _LBER_TYPES_H
 #define _LBER_TYPES_H
 
+#include <ldap_cdefs.h>
+
 LDAP_BEGIN_DECL
 
 /* LBER boolean, enum, integers (32 bits or larger) */