Merge remote branch 'origin/mdb.master'

[openldap] / libraries / liblutil / ntservice.c

diff --git a/libraries/liblutil/ntservice.c b/libraries/liblutil/ntservice.c
index 42b3d99e76fe2833f2fa452df3ee03ad2a2c590a..23d1ea6fb195cc8e04e089ac5e2f523b529eb2df 100644 (file)
--- a/libraries/liblutil/ntservice.c
+++ b/libraries/liblutil/ntservice.c
@@ -1,7 +1,16 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 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-2012 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>.
  */
 
 /*
@@ -22,10 +31,8 @@
 
 #include <ldap.h>
 
-#include "ldap_log.h"
 #include "ldap_pvt_thread.h"
 
-
 #include "ldap_defaults.h"
 
 #include "slapdmsg.h"
@@ -291,7 +298,7 @@ static void *stop_status_routine( void *ptr )
 
 
 
-void WINAPI lutil_ServiceCtrlHandler( IN DWORD Opcode)
+static void WINAPI lutil_ServiceCtrlHandler( IN DWORD Opcode)
 {
        switch (Opcode)
        {