Added missing function prototype in device.h. Changed file license to MIT as it should have been. (per Bug #3004966). Thanks, Jim Bell!

This commit is contained in:
skarg
2010-05-20 23:33:17 +00:00
parent 1bafe2ed98
commit db2e31b17b
+26 -33
View File
@@ -1,36 +1,27 @@
/*####COPYRIGHTBEGIN#### /**************************************************************************
------------------------------------------- *
Copyright (C) 2005 Steve Karg * Copyright (C) 2005 Steve Karg <skarg@users.sourceforge.net>
*
This program is free software; you can redistribute it and/or * Permission is hereby granted, free of charge, to any person obtaining
modify it under the terms of the GNU General Public License * a copy of this software and associated documentation files (the
as published by the Free Software Foundation; either version 2 * "Software"), to deal in the Software without restriction, including
of the License, or (at your option) any later version. * without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
This program is distributed in the hope that it will be useful, * permit persons to whom the Software is furnished to do so, subject to
but WITHOUT ANY WARRANTY; without even the implied warranty of * the following conditions:
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
GNU General Public License for more details. * The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
You should have received a copy of the GNU General Public License *
along with this program; if not, write to: * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
The Free Software Foundation, Inc. * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
59 Temple Place - Suite 330 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
Boston, MA 02111-1307, USA. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
As a special exception, if other files instantiate templates or * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
use macros or inline functions from this file, or you compile * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
this file and link it with other works to produce a work based *
on this file, this file does not by itself cause the resulting *********************************************************************/
work to be covered by the GNU General Public License. However
the source code for this file must still be made available in
accordance with section (3) of the GNU General Public License.
This exception does not invalidate any other reasons why a work
based on this file might be covered by the GNU General Public
License.
-------------------------------------------
####COPYRIGHTEND####*/
/** @file device.h Defines functions for handling all BACnet objects belonging /** @file device.h Defines functions for handling all BACnet objects belonging
* to a BACnet device, as well as Device-specific properties. */ * to a BACnet device, as well as Device-specific properties. */
@@ -165,6 +156,8 @@ extern "C" {
uint16_t Device_Vendor_Identifier( uint16_t Device_Vendor_Identifier(
void); void);
void Device_Set_Vendor_Identifier(
uint16_t vendor_id);
const char *Device_Model_Name( const char *Device_Model_Name(
void); void);