aboutsummaryrefslogtreecommitdiff
path: root/libXpm
diff options
context:
space:
mode:
Diffstat (limited to 'libXpm')
-rw-r--r--libXpm/src/RdFToBuf.c4
-rw-r--r--libXpm/src/RdFToI.c3
-rw-r--r--libXpm/src/WrFFrI.c2
-rw-r--r--libXpm/src/amigax.h4
-rw-r--r--libXpm/src/config.h3
-rw-r--r--libXpm/src/makefile34
6 files changed, 44 insertions, 6 deletions
diff --git a/libXpm/src/RdFToBuf.c b/libXpm/src/RdFToBuf.c
index 7f8ebee61..0594972a6 100644
--- a/libXpm/src/RdFToBuf.c
+++ b/libXpm/src/RdFToBuf.c
@@ -52,9 +52,9 @@
#endif
#if defined(FOR_MSW) || defined(WIN32)
#include <io.h>
+typedef long off_t;
#define stat _stat
#define fstat _fstat
-#define fdopen _fdopen
#define O_RDONLY _O_RDONLY
#endif
@@ -83,7 +83,7 @@ XpmReadFileToBuffer(
close(fd);
return XpmOpenFailed;
}
- fp = fdopen(fd, "r");
+ fp = _fdopen(fd, "r");
if (!fp) {
close(fd);
return XpmOpenFailed;
diff --git a/libXpm/src/RdFToI.c b/libXpm/src/RdFToI.c
index bd09611b1..49fb2ed61 100644
--- a/libXpm/src/RdFToI.c
+++ b/libXpm/src/RdFToI.c
@@ -43,6 +43,7 @@
#include <errno.h>
#include <sys/types.h>
#include <sys/wait.h>
+typedef int pid_t;
#else
#ifdef FOR_MSW
#include <fcntl.h>
@@ -246,7 +247,7 @@ OpenReadFile(
#endif /* z-files */
{
mdata->type = XPMFILE;
- mdata->stream.file = fdopen(fd, "r");
+ mdata->stream.file = _fdopen(fd, "r");
}
if (!mdata->stream.file)
{
diff --git a/libXpm/src/WrFFrI.c b/libXpm/src/WrFFrI.c
index 067c96b3a..e05ff9855 100644
--- a/libXpm/src/WrFFrI.c
+++ b/libXpm/src/WrFFrI.c
@@ -344,7 +344,7 @@ OpenWriteFile(
} else
#endif
{
- mdata->stream.file = fdopen(fd, "w");
+ mdata->stream.file = _fdopen(fd, "w");
mdata->type = XPMFILE;
}
if (!mdata->stream.file) {
diff --git a/libXpm/src/amigax.h b/libXpm/src/amigax.h
index 213ed7619..b8f6ac4b7 100644
--- a/libXpm/src/amigax.h
+++ b/libXpm/src/amigax.h
@@ -48,8 +48,8 @@
/* really never used */
#define ZPixmap 2
-#define Bool int
-#define Status int
+typedef int Bool;
+typedef int Status;
#define True 1
#define False 0
diff --git a/libXpm/src/config.h b/libXpm/src/config.h
new file mode 100644
index 000000000..c22e05936
--- /dev/null
+++ b/libXpm/src/config.h
@@ -0,0 +1,3 @@
+#include <unistd.h>
+
+#define NO_ZPIPE
diff --git a/libXpm/src/makefile b/libXpm/src/makefile
new file mode 100644
index 000000000..cfd21c66b
--- /dev/null
+++ b/libXpm/src/makefile
@@ -0,0 +1,34 @@
+LIBRARY=libXpm
+
+INCLUDES += ..\include\X11
+
+CSRCS = \
+ Attrib.c \
+ CrBufFrI.c \
+ CrBufFrP.c \
+ CrDatFrI.c \
+ CrDatFrP.c \
+ CrIFrBuf.c \
+ CrIFrDat.c \
+ CrIFrP.c \
+ CrPFrBuf.c \
+ CrPFrDat.c \
+ CrPFrI.c \
+ Image.c \
+ Info.c \
+ RdFToBuf.c \
+ RdFToDat.c \
+ RdFToI.c \
+ RdFToP.c \
+ WrFFrBuf.c \
+ WrFFrDat.c \
+ WrFFrI.c \
+ WrFFrP.c \
+ create.c \
+ data.c \
+ hashtab.c \
+ misc.c \
+ parse.c \
+ rgb.c \
+ scan.c
+