Skip to content

Commit

Permalink
Fix min/max confliction #9
Browse files Browse the repository at this point in the history
  • Loading branch information
okaxaki committed Aug 31, 2021
1 parent 9f25348 commit 4062e93
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions emu2413.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* emu2413 v1.5.6
* emu2413 v1.5.7
* https://github.com/digital-sound-antiques/emu2413
* Copyright (C) 2020 Mitsutaka Okazaki
*
Expand Down Expand Up @@ -224,13 +224,17 @@ static int32_t rks_table[8 * 2][2];
static OPLL_PATCH null_patch = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
static OPLL_PATCH default_patch[OPLL_TONE_NUM][(16 + 3) * 2];

/* don't forget min/max is defined as a macro in stdlib.h of Visual C. */
#ifndef min
static INLINE int min(int i, int j) {
return (i < j) ? i : j;
}

#endif
#ifndef max
static INLINE int max(int i, int j) {
return (i > j) ? i : j;
}
#endif

/***************************************************
Expand Down

0 comments on commit 4062e93

Please sign in to comment.