diff --git a/app/config/gimpconfig-dump.c b/app/config/gimpconfig-dump.c index ac9c334168..7afbf22303 100644 --- a/app/config/gimpconfig-dump.c +++ b/app/config/gimpconfig-dump.c @@ -29,6 +29,7 @@ #ifdef G_OS_WIN32 #include /* get_osfhandle */ +#define fileno _fileno #include #else #include diff --git a/app/core/gimp-utils.c b/app/core/gimp-utils.c index e686b2e655..4744023e12 100644 --- a/app/core/gimp-utils.c +++ b/app/core/gimp-utils.c @@ -35,6 +35,7 @@ #ifdef G_OS_WIN32 #include #include +#define getpid _getpid #endif #include diff --git a/app/gui/gui-vtable.c b/app/gui/gui-vtable.c index 74cecb07e3..df02186966 100644 --- a/app/gui/gui-vtable.c +++ b/app/gui/gui-vtable.c @@ -35,6 +35,8 @@ #ifndef pipe #define pipe(fds) _pipe(fds, 4096, _O_BINARY) #endif +#define read _read +#define close _close #else #include #include diff --git a/app/tests/test-xcf.c b/app/tests/test-xcf.c index 877d0b51b8..aa080703fe 100644 --- a/app/tests/test-xcf.c +++ b/app/tests/test-xcf.c @@ -28,6 +28,7 @@ #define WIN32_LEAN_AND_MEAN #include #include +#define close _close #endif #include diff --git a/app/text/gimpfontfactory.c b/app/text/gimpfontfactory.c index a685bc5c09..d6cf038117 100644 --- a/app/text/gimpfontfactory.c +++ b/app/text/gimpfontfactory.c @@ -25,6 +25,7 @@ #ifdef _WIN32 #include +#define read _read #endif #include diff --git a/app/widgets/gimphelp.c b/app/widgets/gimphelp.c index 27a5fbd681..bacfa4e283 100644 --- a/app/widgets/gimphelp.c +++ b/app/widgets/gimphelp.c @@ -22,6 +22,9 @@ #include "config.h" #include +#ifdef _WIN32 +#define strdup _strdup +#endif #include #include diff --git a/libgimpthumb/gimpthumbnail.c b/libgimpthumb/gimpthumbnail.c index 407c972a64..44b04bb655 100644 --- a/libgimpthumb/gimpthumbnail.c +++ b/libgimpthumb/gimpthumbnail.c @@ -40,7 +40,7 @@ #ifdef G_OS_WIN32 #include "libgimpbase/gimpwin32-io.h" #include -#define _getpid getpid +#define getpid _getpid #endif #include "gimpthumb-types.h" diff --git a/plug-ins/common/file-compressor.c b/plug-ins/common/file-compressor.c index 28c83c3149..2a4c26a7b0 100644 --- a/plug-ins/common/file-compressor.c +++ b/plug-ins/common/file-compressor.c @@ -80,6 +80,8 @@ #endif #ifdef _WIN32 #include +#define close _close +#define fileno _fileno #endif #include diff --git a/plug-ins/common/file-raw-data.c b/plug-ins/common/file-raw-data.c index c78da9c59a..a212c93a5c 100644 --- a/plug-ins/common/file-raw-data.c +++ b/plug-ins/common/file-raw-data.c @@ -38,6 +38,9 @@ #ifdef G_OS_WIN32 #include +#define read _read +#define close _close +#define lseek _lseek #endif #include "libgimp/gimp.h" diff --git a/plug-ins/file-faxg3/faxg3.c b/plug-ins/file-faxg3/faxg3.c index 2742bcddf8..d6ed69aeeb 100644 --- a/plug-ins/file-faxg3/faxg3.c +++ b/plug-ins/file-faxg3/faxg3.c @@ -35,6 +35,9 @@ #ifdef G_OS_WIN32 #include +#define read _read +#define close _close +#define lseek _lseek #endif #ifndef _O_BINARY diff --git a/plug-ins/imagemap/imap_cern_lex.c b/plug-ins/imagemap/imap_cern_lex.c index 3803affeda..cdb1362957 100644 --- a/plug-ins/imagemap/imap_cern_lex.c +++ b/plug-ins/imagemap/imap_cern_lex.c @@ -628,6 +628,8 @@ char *cern_text; #endif #ifdef _WIN32 #include +#define isatty _isatty +#define fileno _fileno #endif #ifndef YY_EXTRA_TYPE diff --git a/plug-ins/imagemap/imap_csim_lex.c b/plug-ins/imagemap/imap_csim_lex.c index 7e508cd3bf..6fecdce089 100644 --- a/plug-ins/imagemap/imap_csim_lex.c +++ b/plug-ins/imagemap/imap_csim_lex.c @@ -653,6 +653,8 @@ char *csim_text; #endif #ifdef _WIN32 #include +#define isatty _isatty +#define fileno _fileno #endif #ifndef YY_EXTRA_TYPE diff --git a/plug-ins/imagemap/imap_ncsa_lex.c b/plug-ins/imagemap/imap_ncsa_lex.c index 1d2018c279..380b8388e2 100644 --- a/plug-ins/imagemap/imap_ncsa_lex.c +++ b/plug-ins/imagemap/imap_ncsa_lex.c @@ -593,6 +593,8 @@ char *ncsa_text; #endif #ifdef _WIN32 #include +#define isatty _isatty +#define fileno _fileno #endif #ifndef YY_EXTRA_TYPE diff --git a/plug-ins/metadata/metadata-editor.c b/plug-ins/metadata/metadata-editor.c index 53110e89d2..0595b8223d 100644 --- a/plug-ins/metadata/metadata-editor.c +++ b/plug-ins/metadata/metadata-editor.c @@ -22,6 +22,10 @@ #include #include +#ifdef _WIN32 +#include +#define strdup _strdup +#endif #include #include diff --git a/plug-ins/script-fu/libscriptfu/ftx/ftx.c b/plug-ins/script-fu/libscriptfu/ftx/ftx.c index cffbc82e2e..9ab6f74ae0 100644 --- a/plug-ins/script-fu/libscriptfu/ftx/ftx.c +++ b/plug-ins/script-fu/libscriptfu/ftx/ftx.c @@ -13,6 +13,10 @@ #if HAVE_UNISTD_H #include #endif +#ifdef _WIN32 +#include +#define unlink _unlink +#endif #include #include diff --git a/tools/gimp-test-clipboard.c b/tools/gimp-test-clipboard.c index 974d3b70fa..d7b2fb7f26 100644 --- a/tools/gimp-test-clipboard.c +++ b/tools/gimp-test-clipboard.c @@ -21,6 +21,8 @@ #include #define popen _popen #define pclose _pclose +#define write _write +#define close _close #endif #include