Ibis parser: fix a collision name with a windows header (msys2 specific)
This is recurrent conflict. (fixed by changing INPUT to INPUT_SDT).
This commit is contained in:
parent
2cfe78170c
commit
ffd578ef70
|
@ -536,7 +536,7 @@ bool IbisModel::Check()
|
|||
Report( _( "Invalid GND clamp." ), RPT_SEVERITY_ERROR );
|
||||
status = false;
|
||||
}
|
||||
if( m_type != IBIS_MODEL_TYPE::INPUT_ECL && m_type != IBIS_MODEL_TYPE::INPUT
|
||||
if( m_type != IBIS_MODEL_TYPE::INPUT_ECL && m_type != IBIS_MODEL_TYPE::INPUT_STD
|
||||
&& m_type != IBIS_MODEL_TYPE::TERMINATOR && m_type != IBIS_MODEL_TYPE::SERIES
|
||||
&& m_type != IBIS_MODEL_TYPE::SERIES_SWITCH )
|
||||
{
|
||||
|
@ -1830,7 +1830,7 @@ bool IbisParser::readModel()
|
|||
if( readWord( subparam ) )
|
||||
{
|
||||
if( !strcmp( subparam.c_str(), "Input" ) )
|
||||
m_currentModel->m_type = IBIS_MODEL_TYPE::INPUT;
|
||||
m_currentModel->m_type = IBIS_MODEL_TYPE::INPUT_STD;
|
||||
else if( !strcmp( subparam.c_str(), "Output" ) )
|
||||
m_currentModel->m_type = IBIS_MODEL_TYPE::OUTPUT;
|
||||
else if( !strcmp( subparam.c_str(), "I/O" ) )
|
||||
|
|
|
@ -388,7 +388,7 @@ Series, and Series_switch.
|
|||
enum class IBIS_MODEL_TYPE
|
||||
{
|
||||
UNDEFINED,
|
||||
INPUT,
|
||||
INPUT_STD, // Do not use INPUT: it can conflict with a windows header on MSYS2
|
||||
OUTPUT,
|
||||
IO,
|
||||
THREE_STATE,
|
||||
|
|
|
@ -1280,7 +1280,7 @@ bool KIBIS_PIN::writeSpiceDevice( std::string* aDest, std::string aName, KIBIS_M
|
|||
|
||||
switch( aModel.m_type )
|
||||
{
|
||||
case IBIS_MODEL_TYPE::INPUT:
|
||||
case IBIS_MODEL_TYPE::INPUT_STD:
|
||||
case IBIS_MODEL_TYPE::IO:
|
||||
case IBIS_MODEL_TYPE::IO_OPEN_DRAIN:
|
||||
case IBIS_MODEL_TYPE::IO_OPEN_SINK:
|
||||
|
|
Loading…
Reference in New Issue