summaryrefslogtreecommitdiff
path: root/codec
diff options
context:
space:
mode:
authorFrancois-Olivier Devaux <fodevaux@users.noreply.github.com>2010-03-07 21:27:37 +0000
committerFrancois-Olivier Devaux <fodevaux@users.noreply.github.com>2010-03-07 21:27:37 +0000
commit3ecae15da2f4f42531d007c65997248c616e40f3 (patch)
treea7cabf2fa043a5d8304a4645d0a7a622ea6b0c67 /codec
parentc2da8234d9c2f18507e343a269aa3e2a076edde4 (diff)
Fixed small compatibility issues with win32 in codec (moved include <strings.h>)
Diffstat (limited to 'codec')
-rw-r--r--codec/image_to_j2k.c8
-rw-r--r--codec/j2k_to_image.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c
index bde18543..f0314562 100644
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
@@ -31,7 +31,6 @@
*/
#include <stdio.h>
#include <string.h>
-#include <strings.h> /* strncasecmp */
#include <stdlib.h>
#include <math.h>
@@ -42,8 +41,9 @@
#include "index.h"
#ifndef WIN32
-#define stricmp strcasecmp
-#define strnicmp strncasecmp
+#include <strings.h>
+#define _stricmp strcasecmp
+#define _strnicmp strncasecmp
#endif
/* ----------------------------------------------------------------------- */
@@ -400,7 +400,7 @@ int get_file_format(char *filename) {
return -1;
ext++;
for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
- if(strnicmp(ext, extension[i], 3) == 0) {
+ if(_strnicmp(ext, extension[i], 3) == 0) {
return format[i];
}
}
diff --git a/codec/j2k_to_image.c b/codec/j2k_to_image.c
index feee30a0..72245b09 100644
--- a/codec/j2k_to_image.c
+++ b/codec/j2k_to_image.c
@@ -41,8 +41,8 @@
#include "index.h"
#ifndef WIN32
-#define stricmp strcasecmp
-#define strnicmp strncasecmp
+#define _stricmp strcasecmp
+#define _strnicmp strncasecmp
#endif
/* ----------------------------------------------------------------------- */
@@ -196,7 +196,7 @@ int get_file_format(char *filename) {
ext++;
if(ext) {
for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
- if(strnicmp(ext, extension[i], 3) == 0) {
+ if(_strnicmp(ext, extension[i], 3) == 0) {
return format[i];
}
}