summaryrefslogtreecommitdiff
path: root/opl/dbopl.h
diff options
context:
space:
mode:
authorJames Haley2010-09-10 01:53:57 +0000
committerJames Haley2010-09-10 01:53:57 +0000
commit9f4c5a6ed4e490fb51aa207c2def75fcb2622584 (patch)
tree3f12bb085abcd77e071091bcd431e6c376288397 /opl/dbopl.h
parent120d90c67b2a4aa0a8883c4897241dee2222acd2 (diff)
downloadchocolate-doom-9f4c5a6ed4e490fb51aa207c2def75fcb2622584.tar.gz
chocolate-doom-9f4c5a6ed4e490fb51aa207c2def75fcb2622584.tar.bz2
chocolate-doom-9f4c5a6ed4e490fb51aa207c2def75fcb2622584.zip
Post-merge fixes: Created project for OPL library. Fixed OPL library to
not use GNU C-isms such as inline keyword, declaration/statement mixing, and strange calling convention syntax for import function pointers. Fixed critical buffer overflow in M_BindChatControls - should be back-merged immediately. Added autogenerated directories *back* to ignore list. Subversion-branch: /branches/strife-branch Subversion-revision: 2052
Diffstat (limited to 'opl/dbopl.h')
-rw-r--r--opl/dbopl.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/opl/dbopl.h b/opl/dbopl.h
index a5c10bfd..63aa1330 100644
--- a/opl/dbopl.h
+++ b/opl/dbopl.h
@@ -200,4 +200,7 @@ void Chip__Chip(Chip *self);
void Chip__WriteReg(Chip *self, Bit32u reg, Bit8u val );
void Chip__GenerateBlock2(Chip *self, Bitu total, Bit32s* output );
-
+// haleyjd 09/09/10: Not standard C.
+#ifdef _MSC_VER
+#define inline __inline
+#endif