Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / liblber / nt_err.c

diff --git a/libraries/liblber/nt_err.c b/libraries/liblber/nt_err.c
index bc3f4e7cebce0d10acb377949b415733e61ef911..fa4e3a47ad2dc8a1d651dc3c929f16714ba1883b 100644 (file)
--- a/libraries/liblber/nt_err.c
+++ b/libraries/liblber/nt_err.c
@@ -1,13 +1,23 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2014 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * 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 the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
+
 #include "portable.h"
 
 #ifdef HAVE_WINSOCK2
 #include <winsock2.h>
-#elif HAVE_WINSOCK
+#elif defined(HAVE_WINSOCK)
 #include <winsock.h>
 #endif /* HAVE_WINSOCK(2) */
 
@@ -15,8 +25,7 @@
 
 char *ber_pvt_wsa_err2string( int err )
 {
-       switch( err )
-       {
+       switch( err ) {
                LBER_RETSTR( WSAEINTR )
                LBER_RETSTR( WSAEBADF )
                LBER_RETSTR( WSAEACCES )
@@ -84,4 +93,4 @@ char *ber_pvt_wsa_err2string( int err )
                LBER_RETSTR( WSANO_DATA )
        }
        return "unknown WSA error";
-}
\ No newline at end of file
+}