Skip to content

Commit d310678

Browse files
committed
Merge branch 'remove-defh-strcasecmp' into 'master'
replace str(n)casecmp by SCIPstr(n)casecmp See merge request integer/scip!3544
2 parents 51211be + c6e48cc commit d310678

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

CHANGELOG

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ Interface changes
4545
- SCIPdebugClearSol() for clearing the debug solution
4646
- Renamed XML functions to avoid name clash with libxml2 by adding "SCIP": SCIPxmlProcess(), SCIPxmlNewNode(), SCIPxmlNewAttr(), SCIPxmlAddAttr(), SCIPxmlAppendChild(), SCIPxmlFreeNode(), SCIPxmlShowNode(), SCIPxmlGetAttrval(), SCIPxmlFirstNode(), SCIPxmlNextNode(), SCIPxmlFindNode(), SCIPxmlFindNodeMaxdepth(), SCIPxmlNextSibl(), SCIPxmlPrevSibl(), SCIPxmlFirstChild(), SCIPxmlLastChild(), SCIPxmlGetName(), SCIPxmlGetLine(), SCIPxmlGetData(), SCIPxmlFindPcdata().
4747

48+
### Changes in preprocessor macros
49+
50+
- removed `#define` of `strcasecmp` and `strncasecmp` (in case of Windows builds) in scip/def.h;
51+
use SCIPstr(n)casecmp() (scip/pub_misc.h) instead
4852

4953
### Command line interface
5054

src/lpi/lpi_xprs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040

4141
#include <assert.h>
4242
#include <string.h>
43-
#if defined(_WIN32) || defined(_WIN64)
43+
#ifdef _MSC_VER
44+
#define strcasecmp _stricmp
4445
#else
4546
#include <strings.h> /*lint --e{766}*/
4647
#endif

src/scip/def.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,6 @@
9999
#define SCIP_Shortbool uint8_t /**< type used for Boolean values with less space */
100100
#endif
101101

102-
/*
103-
* Add some macros for differing functions on Windows
104-
*/
105-
#ifdef _WIN32
106-
#define strcasecmp _stricmp
107-
#define strncasecmp _strnicmp
108-
#endif
109-
110102
/*
111103
* Define the macro SCIP_EXPORT if it is not included from the generated header
112104
*/

0 commit comments

Comments
 (0)