summaryrefslogtreecommitdiff
path: root/include/octmac.h
diff options
context:
space:
mode:
authorkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-08-08 22:22:24 +0000
committerkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-08-08 22:22:24 +0000
commit8eb7408ab32c29f7cd255f7d908643c73fa17345 (patch)
tree70198f81253f24c9ab81829971b8cc12157c99d8 /include/octmac.h
parentb46f82a8ef7621081e65964662bd9b7eb0006951 (diff)
update Octasic API headers (but not code yet) to PR43, and use version with GPL licenses instead of proprietary licenses
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@1262 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'include/octmac.h')
-rw-r--r--include/octmac.h26
1 files changed, 17 insertions, 9 deletions
diff --git a/include/octmac.h b/include/octmac.h
index f8ce932..5e72470 100644
--- a/include/octmac.h
+++ b/include/octmac.h
@@ -2,25 +2,34 @@
File: octmac.h
-Copyright (c) 2001 Octasic Inc. All rights reserved.
+ Copyright (c) 2001-2006 Octasic Inc.
Description:
-This source code is Octasic Confidential. Use of and access to this code
-is covered by the Octasic Device Enabling Software License Agreement.
-Acknowledgement of the Octasic Device Enabling Software License was
-required for access to this code. A copy was also provided with the release.
+ Common macro definitions.
+This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API is
+free software; you can redistribute it and/or modify it under the terms of
+the GNU General Public License as published by the Free Software Foundation;
+either version 2 of the License, or (at your option) any later version.
-$Octasic_Release: OCT610xAPI-01.00-PR37 $
+The OCT6100 GPL API is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
-$Octasic_Revision: 13 $
+You should have received a copy of the GNU General Public License
+along with the OCT6100 GPL API; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+$Octasic_Release: OCT612xAPI-01.00-PR43 $
+
+$Octasic_Revision: 14 $
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTMAC_H__
#define __OCTMAC_H__
-
/*--------------------------------------------------------------------------
C language
----------------------------------------------------------------------------*/
@@ -29,7 +38,6 @@ $Octasic_Revision: 13 $
extern "C" {
#endif
-
/***************************** DEFINES *************************************/
/* Combine l & h to form a 32 bit quantity. */