summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/osdcomm.h
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-10-12 05:56:47 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-10-12 05:56:47 +0000
commit3851b425b7a0fa90f5109ad16251f7694418d089 (patch)
treef18dab06e9888e9b0d2839d6983a9d5d5f77369a /src/osd/osdcomm.h
parent1c6a07a0e5e2d86a7d58ac5e0bf61132732ea346 (diff)
Moved all the OSD/windows code over to straight BSD license.
Updated osdmini to work again and compile as an actual target (doing nothing at the moment). Converted all of its code over to straight BSD as well.
Diffstat (limited to 'src/osd/osdcomm.h')
-rw-r--r--src/osd/osdcomm.h33
1 files changed, 31 insertions, 2 deletions
diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h
index 858c46e12b2..efdd7d3c05b 100644
--- a/src/osd/osdcomm.h
+++ b/src/osd/osdcomm.h
@@ -5,8 +5,36 @@
Common definitions shared by the OSD layer. This includes the most
fundamental integral types as well as compiler-specific tweaks.
- Copyright Nicola Salmoria and the MAME Team.
- Visit http://mamedev.org for licensing and usage restrictions.
+****************************************************************************
+
+ Copyright Aaron Giles
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name 'MAME' nor the names of its contributors may be
+ used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
@@ -160,6 +188,7 @@ __extension__ typedef signed long long INT64;
#define S64(val) val
#endif
+
/* MINGW has adopted the MSVC formatting for 64-bit ints as of gcc 4.4 */
#if (defined(__MINGW32__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))) || defined(_MSVC_VER)
#define I64FMT "I64"