mirror of https://github.com/GNOME/gimp.git
renamed GimpOrientationType with Compat postfix to avoid name clashing
2003-07-26 Hans Breuer <hans@breuer.org> * libgimp/gimpcompat.h : renamed GimpOrientationType with Compat postfix to avoid name clashing when using this header together with libgimp/gimpenums.h * app/composite/makefile.msc : (new file) **/makefile.msc : updated * libgimp/gimp.c : use static defined _tile<widht|height> in this file instead of function call * libgimp/gimp.def libgimp/libgimpui.def : moved from former to latter : gimp_<brush|font|gradient|pattern>_select_<new|destroy> added to former gimp_<brushes|gradients|patterns>_popup * app/paint/gimppaintcore.h : removed double semicolon which gave msvc error C2059: syntax error : ';' * libgimpbase/gimpwin32-io.h : (new file) compatibilty defines which were spread over multiple files to make up mostly for missing unistd.h * app/base/tile-swap.c app/core/gimpimagefile.c libgimpbase/gimpdatafiles.c plug-ins/FractalExplorer/FractalExplorer.c : use new header * plug-ins/gflare/gflare.c plug-ins/flame/flame.c plug-ins/FractalExplorer/Dialogs.c : removed #ifdef G_OS_WIN32 special casing, not needed anymore due to g_file_test() usage * app/text/*.* : changes required for build with PangoWin32, but not commited ...
This commit is contained in:
Hans Breuer
Hans Breuer
parent
4d1c6041f3
commit
b70d6c3317
36
ChangeLog
36
ChangeLog
|
|
@ -1,3 +1,39 @@
|
|||
2003-07-26 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* libgimp/gimpcompat.h : renamed GimpOrientationType
|
||||
with Compat postfix to avoid name clashing when using
|
||||
this header together with libgimp/gimpenums.h
|
||||
|
||||
* app/composite/makefile.msc : (new file)
|
||||
**/makefile.msc : updated
|
||||
|
||||
* libgimp/gimp.c : use static defined _tile<widht|height>
|
||||
in this file instead of function call
|
||||
|
||||
* libgimp/gimp.def libgimp/libgimpui.def : moved from former
|
||||
to latter : gimp_<brush|font|gradient|pattern>_select_<new|destroy>
|
||||
added to former gimp_<brushes|gradients|patterns>_popup
|
||||
|
||||
* app/paint/gimppaintcore.h : removed double semicolon
|
||||
which gave msvc error C2059: syntax error : ';'
|
||||
|
||||
* libgimpbase/gimpwin32-io.h : (new file) compatibilty defines
|
||||
which were spread over multiple files to make up mostly for
|
||||
missing unistd.h
|
||||
|
||||
* app/base/tile-swap.c app/core/gimpimagefile.c
|
||||
libgimpbase/gimpdatafiles.c
|
||||
plug-ins/FractalExplorer/FractalExplorer.c : use new header
|
||||
|
||||
* plug-ins/gflare/gflare.c
|
||||
plug-ins/flame/flame.c
|
||||
plug-ins/FractalExplorer/Dialogs.c :
|
||||
removed #ifdef G_OS_WIN32 special casing, not needed anymore
|
||||
due to g_file_test() usage
|
||||
|
||||
* app/text/*.* : changes required for build with PangoWin32,
|
||||
but not commited ...
|
||||
|
||||
2003-07-26 Adam D. Moss <adam@gimp.org>
|
||||
|
||||
* LICENSE: (new file) Explain the mix of licenses within
|
||||
|
|
|
|||
|
|
@ -33,14 +33,7 @@
|
|||
#include <glib-object.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#include <io.h>
|
||||
#endif
|
||||
|
||||
#ifndef _O_BINARY
|
||||
#define _O_BINARY 0
|
||||
#endif
|
||||
#ifndef _O_TEMPORARY
|
||||
#define _O_TEMPORARY 0
|
||||
#include <libgimpbase/gimpwin32-io.h>
|
||||
#endif
|
||||
|
||||
#include "base-types.h"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
# autogenerated from automake.am with automake.py
|
||||
TOP = ..\..\..
|
||||
PRJ_TOP = ..\..
|
||||
PACKAGE = appcomposite
|
||||
PKG_VER = 1.3
|
||||
!INCLUDE $(TOP)\glib\build\win32\make.msc
|
||||
|
||||
top_srcdir = $(PRJ_TOP)
|
||||
top_builddir = $(PRJ_TOP)
|
||||
includedir = $(PRJ_TOP)
|
||||
LT_RELEASE = $(PKG_VER)
|
||||
|
||||
OBJECTS = \
|
||||
gimp-composite.obj \
|
||||
gimp-composite-dispatch.obj \
|
||||
gimp-composite-generic.obj \
|
||||
gimp-composite-mmx.obj \
|
||||
gimp-composite-sse.obj \
|
||||
|
||||
mmx_sources = \
|
||||
|
||||
# temporay hack, link appbase to find our required exports
|
||||
PKG_LINK = \
|
||||
..\base\appbase.lib \
|
||||
$(GLIB_LIBS) \
|
||||
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
|
||||
|
||||
INCLUDES = \
|
||||
-FImsvc_recommended_pragmas.h \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/app \
|
||||
$(GTK2_CFLAGS) \
|
||||
-I$(includedir)
|
||||
|
||||
all : \
|
||||
$(PRJ_TOP)\config.h \
|
||||
$(PACKAGE).lib \
|
||||
$(PACKAGE)-$(PKG_VER).dll
|
||||
|
||||
|
||||
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
|
||||
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
|
||||
|
||||
RESOURCE = $(PACKAGE).res
|
||||
|
||||
$(PACKAGE).lib : $(OBJECTS)
|
||||
lib /out:$(PACKAGE).lib $(OBJECTS)
|
||||
|
||||
$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
|
||||
$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
|
||||
|
||||
$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
|
||||
$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
|
||||
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
|
||||
|
||||
.c.obj :
|
||||
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
|
||||
|
|
@ -19,6 +19,7 @@ OBJECTS = \
|
|||
gimpbaseconfig.obj \
|
||||
gimpconfig.obj \
|
||||
gimpconfig-deserialize.obj \
|
||||
gimpconfig-error.obj \
|
||||
gimpconfig-params.obj \
|
||||
gimpconfig-path.obj \
|
||||
gimpconfig-serialize.obj \
|
||||
|
|
|
|||
|
|
@ -37,13 +37,7 @@
|
|||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
# include <direct.h>
|
||||
# define mkdir(n,a) _mkdir(n)
|
||||
# include <io.h>
|
||||
# define chmod(n,f) _chmod(n,f)
|
||||
# ifndef S_ISREG
|
||||
# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
|
||||
# endif
|
||||
#include <libgimpbase/gimpwin32-io.h>
|
||||
#endif
|
||||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ OBJECTS = \
|
|||
gimpedit.obj \
|
||||
gimpenvirontable.obj \
|
||||
gimpgradient.obj \
|
||||
gimpgrid.obj \
|
||||
gimp-gradients.obj \
|
||||
gimpimage.obj \
|
||||
gimpimagemap.obj \
|
||||
|
|
@ -68,6 +69,7 @@ OBJECTS = \
|
|||
gimpimage-crop.obj \
|
||||
gimpimage-duplicate.obj \
|
||||
gimpimage-flip.obj \
|
||||
gimpimage-grid.obj \
|
||||
gimpimage-guides.obj \
|
||||
gimpimage-mask.obj \
|
||||
gimpimage-mask-select.obj \
|
||||
|
|
@ -79,6 +81,7 @@ OBJECTS = \
|
|||
gimpimage-qmask.obj \
|
||||
gimpimage-resize.obj \
|
||||
gimpimage-rotate.obj \
|
||||
gimpimage-snap.obj \
|
||||
gimpimage-scale.obj \
|
||||
gimpimage-undo.obj \
|
||||
gimpimage-undo-push.obj \
|
||||
|
|
@ -102,6 +105,7 @@ OBJECTS = \
|
|||
gimppreviewcache.obj \
|
||||
gimpscanconvert.obj \
|
||||
gimptemplate.obj \
|
||||
gimptooloptions.obj \
|
||||
gimp-templates.obj \
|
||||
gimptoolinfo.obj \
|
||||
gimpundo.obj \
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ INCLUDES = \
|
|||
-FImsvc_recommended_pragmas.h \
|
||||
-I$(PRJ_TOP) \
|
||||
-I$(PRJ_TOP)/app \
|
||||
$(GTK2_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
|
||||
DEFINES = \
|
||||
-DG_LOG_DOMAIN=\"Gimp-File\"
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ OBJECTS = \
|
|||
convert-dialog.obj \
|
||||
data-commands.obj \
|
||||
debug-commands.obj \
|
||||
device-status-dialog.obj \
|
||||
dialogs.obj \
|
||||
dialogs-commands.obj \
|
||||
dialogs-menu.obj \
|
||||
|
|
@ -63,6 +62,7 @@ OBJECTS = \
|
|||
gradients-commands.obj \
|
||||
gradients-menu.obj \
|
||||
gradient-select.obj \
|
||||
grid-dialog.obj \
|
||||
gui.obj \
|
||||
help-commands.obj \
|
||||
image-commands.obj \
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ top_srcdir = $(PRJ_TOP)
|
|||
top_builddir = $(PRJ_TOP)
|
||||
includedir = $(PRJ_TOP)
|
||||
LT_RELEASE = $(PKG_VER)
|
||||
SUBDIRS = paint-funcs base config xcf core file text \
|
||||
SUBDIRS = composite paint-funcs base config xcf core file text \
|
||||
display paint vectors pdb plug-in tools widgets gui
|
||||
|
||||
sub-all:
|
||||
|
|
@ -26,6 +26,7 @@ LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG)
|
|||
|
||||
PKG_LINK = \
|
||||
config/appconfig.lib \
|
||||
composite/appcomposite.lib \
|
||||
paint/apppaint.lib \
|
||||
paint-funcs/apppaint-funcs.lib \
|
||||
plug-in/appplug-in.lib \
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@ mmx_sources = \
|
|||
|
||||
# temporay hack, link appbase to find our required exports
|
||||
PKG_LINK = \
|
||||
..\base\appbase.lib \
|
||||
..\base\appbase-$(PKG_VER).lib \
|
||||
..\composite\appcomposite-$(PKG_VER).lib \
|
||||
$(GLIB_LIBS) \
|
||||
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
|
||||
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ struct _GimpPaintCore
|
|||
/* brush buffers */
|
||||
MaskBuf *pressure_brush;
|
||||
|
||||
MaskBuf *solid_brushes[PAINT_CORE_SOLID_SUBSAMPLE][PAINT_CORE_SOLID_SUBSAMPLE];;
|
||||
MaskBuf *solid_brushes[PAINT_CORE_SOLID_SUBSAMPLE][PAINT_CORE_SOLID_SUBSAMPLE];
|
||||
MaskBuf *last_solid_brush;
|
||||
gboolean solid_cache_invalid;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ OBJECTS = \
|
|||
gimppaintcore-undo.obj \
|
||||
gimppaintoptions.obj \
|
||||
gimppencil.obj \
|
||||
gimppenciloptions.obj \
|
||||
gimpsmudge.obj \
|
||||
gimpsmudgeoptions.obj \
|
||||
paint.obj \
|
||||
|
|
|
|||
|
|
@ -23,8 +23,6 @@ PKG_LINK = \
|
|||
..\widgets\appwidgets-$(PKG_VER).lib \
|
||||
|
||||
OBJECTS = \
|
||||
# tools-enums.obj \
|
||||
tools.obj \
|
||||
gimpairbrushtool.obj \
|
||||
# gimpbezierselecttool.obj \
|
||||
gimpblendoptions.obj \
|
||||
|
|
@ -68,6 +66,7 @@ OBJECTS = \
|
|||
gimpmoveoptions.obj \
|
||||
gimpmovetool.obj \
|
||||
gimppaintbrushtool.obj \
|
||||
gimppaintoptions-gui.obj \
|
||||
gimppainttool.obj \
|
||||
gimppenciltool.obj \
|
||||
gimpperspectivetool.obj \
|
||||
|
|
@ -84,14 +83,14 @@ OBJECTS = \
|
|||
gimpthresholdtool.obj \
|
||||
gimptool.obj \
|
||||
gimptoolcontrol.obj \
|
||||
gimptooloptions-gui.obj \
|
||||
gimptransformoptions.obj \
|
||||
gimptransformtool.obj \
|
||||
gimptransformtool-undo.obj \
|
||||
gimpvectoroptions.obj \
|
||||
gimpvectortool.obj \
|
||||
paint_options.obj \
|
||||
tool_options.obj \
|
||||
tool_manager.obj \
|
||||
tools.obj \
|
||||
tools-enums.obj \
|
||||
|
||||
INCLUDES = \
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ INCLUDES = \
|
|||
-I$(includedir) \
|
||||
|
||||
OBJECTS = \
|
||||
gimpanchor.obj \
|
||||
gimpvectors.obj \
|
||||
gimpbezierstroke.obj \
|
||||
gimpstroke.obj \
|
||||
gimpvectors.obj \
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ OBJECTS = \
|
|||
gimpdatafactoryview.obj \
|
||||
gimpdeviceinfo.obj \
|
||||
gimpdevices.obj \
|
||||
gimpdevicestatus.obj \
|
||||
gimpdialogfactory.obj \
|
||||
gimpdnd.obj \
|
||||
gimpdock.obj \
|
||||
|
|
|
|||
|
|
@ -1525,7 +1525,7 @@ gimp_config (GPConfig *config)
|
|||
* transfering tile data
|
||||
*/
|
||||
gchar fileMapName[128];
|
||||
gint tileByteSize = gimp_tile_width () * gimp_tile_height () * 4;
|
||||
gint tileByteSize = _tile_width * _tile_height * 4;
|
||||
|
||||
/* From the id, derive the file map name */
|
||||
g_snprintf (fileMapName, sizeof (fileMapName), "GIMP%d.SHM", _shm_ID);
|
||||
|
|
|
|||
|
|
@ -3,10 +3,9 @@ EXPORTS
|
|||
gimp_airbrush_default
|
||||
gimp_attach_new_parasite
|
||||
gimp_blend
|
||||
gimp_brush_select_destroy
|
||||
gimp_brush_select_new
|
||||
gimp_brushes_close_popup
|
||||
gimp_brushes_get_brush_data
|
||||
gimp_brushes_popup
|
||||
gimp_brushes_set_popup
|
||||
gimp_bucket_fill
|
||||
gimp_by_color_select
|
||||
|
|
@ -99,8 +98,6 @@ EXPORTS
|
|||
gimp_floating_sel_remove
|
||||
gimp_floating_sel_rigor
|
||||
gimp_floating_sel_to_layer
|
||||
gimp_font_select_destroy
|
||||
gimp_font_select_new
|
||||
gimp_fonts_close_popup
|
||||
gimp_fonts_popup
|
||||
gimp_fonts_set_popup
|
||||
|
|
@ -114,13 +111,12 @@ EXPORTS
|
|||
gimp_get_progname
|
||||
gimp_gimprc_query
|
||||
gimp_gimprc_set
|
||||
gimp_gradient_select_destroy
|
||||
gimp_gradient_select_new
|
||||
gimp_gradients_close_popup
|
||||
gimp_gradients_get_gradient
|
||||
gimp_gradients_get_gradient_data
|
||||
gimp_gradients_get_gradient_data
|
||||
gimp_gradients_get_list
|
||||
gimp_gradients_popup
|
||||
gimp_gradients_sample_custom
|
||||
gimp_gradients_sample_uniform
|
||||
gimp_gradients_set_gradient
|
||||
|
|
@ -266,10 +262,9 @@ EXPORTS
|
|||
gimp_path_set_points
|
||||
gimp_path_set_tattoo
|
||||
gimp_path_stroke_current
|
||||
gimp_pattern_select_destroy
|
||||
gimp_pattern_select_new
|
||||
gimp_patterns_close_popup
|
||||
gimp_patterns_get_pattern_data
|
||||
gimp_patterns_popup
|
||||
gimp_patterns_set_popup
|
||||
gimp_pencil
|
||||
gimp_perspective
|
||||
|
|
@ -328,6 +323,7 @@ EXPORTS
|
|||
gimp_show_tool_tips
|
||||
gimp_smudge
|
||||
gimp_smudge_default
|
||||
gimp_temp_PDB_name
|
||||
gimp_temp_name
|
||||
gimp_text
|
||||
gimp_text_fontname
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ enum
|
|||
GIMP_HORIZONTAL = GIMP_ORIENTATION_HORIZONTAL,
|
||||
GIMP_VERTICAL = GIMP_ORIENTATION_VERTICAL,
|
||||
GIMP_UNKNOWN = GIMP_ORIENTATION_UNKNOWN
|
||||
} GimpOrientationType;
|
||||
} GimpOrientationTypeCompat;
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
EXPORTS
|
||||
gimp_brush_select_widget_close
|
||||
gimp_brush_select_new
|
||||
gimp_brush_select_destroy
|
||||
gimp_brush_select_widget_new
|
||||
gimp_brush_select_widget_close
|
||||
gimp_brush_select_widget_set
|
||||
gimp_channel_menu_new
|
||||
gimp_drawable_menu_new
|
||||
|
|
@ -15,16 +17,19 @@ EXPORTS
|
|||
gimp_fixme_preview_new2
|
||||
gimp_fixme_preview_put_pixel
|
||||
gimp_fixme_preview_update
|
||||
gimp_font_select_widget_close
|
||||
gimp_font_select_new
|
||||
gimp_font_select_widget_new
|
||||
gimp_font_select_widget_close
|
||||
gimp_font_select_widget_set
|
||||
gimp_gradient_select_widget_close
|
||||
gimp_gradient_select_new
|
||||
gimp_gradient_select_widget_new
|
||||
gimp_gradient_select_widget_close
|
||||
gimp_gradient_select_widget_set
|
||||
gimp_image_menu_new
|
||||
gimp_layer_menu_new
|
||||
gimp_pattern_select_widget_close
|
||||
gimp_pattern_select_new
|
||||
gimp_pattern_select_widget_new
|
||||
gimp_pattern_select_widget_close
|
||||
gimp_pattern_select_widget_set
|
||||
gimp_plug_in_get_path
|
||||
gimp_ui_init
|
||||
|
|
|
|||
|
|
@ -26,6 +26,11 @@ DEPLIBS = $(GLIB_LIBS) $(INTL_LIBS)
|
|||
|
||||
# CFLAGS = $(GLIB_CFLAGS)
|
||||
|
||||
!IFNDEF DEBUG
|
||||
# Debug Release!
|
||||
OPTIMIZE = -Zi -MD
|
||||
!ENDIF
|
||||
|
||||
all : \
|
||||
..\config.h \
|
||||
# gimpi.lib \
|
||||
|
|
@ -57,11 +62,11 @@ PDB_WRAPPERS_O = \
|
|||
gimpguides_pdb.obj \
|
||||
gimphelp_pdb.obj \
|
||||
gimpimage_pdb.obj \
|
||||
gimppainttools_pdb.obj \
|
||||
gimplayer_pdb.obj \
|
||||
gimpmessage_pdb.obj \
|
||||
gimpmisc_pdb.obj \
|
||||
gimpmisctools_pdb.obj \
|
||||
gimppainttools_pdb.obj \
|
||||
gimppalette_pdb.obj \
|
||||
gimpparasite_pdb.obj \
|
||||
gimppaths_pdb.obj \
|
||||
|
|
@ -76,6 +81,7 @@ PDB_WRAPPERS_O = \
|
|||
gimpundo_pdb.obj \
|
||||
gimpunit_pdb.obj \
|
||||
|
||||
|
||||
# used by libgimp and core (?)
|
||||
gimpi_OBJECTS = \
|
||||
gimpenv.obj \
|
||||
|
|
@ -95,7 +101,7 @@ gimp_OBJECTS = \
|
|||
# $(gimpi_OBJECTS) \
|
||||
gimpchannel.obj \
|
||||
gimpdrawable.obj \
|
||||
gimphelp.obj \
|
||||
# gimphelp.obj \
|
||||
gimpimage.obj \
|
||||
gimplayer.obj \
|
||||
gimpmisc.obj \
|
||||
|
|
@ -121,10 +127,15 @@ gimp.obj : gimp.c
|
|||
gimpui_OBJECTS = \
|
||||
gimpui.obj \
|
||||
gimpbrushmenu.obj \
|
||||
gimpbrushselect.obj \
|
||||
gimpfontmenu.obj \
|
||||
gimpfontselect.obj \
|
||||
gimpfontselect_pdb.obj \
|
||||
gimpgradientmenu.obj \
|
||||
gimpgradientselect.obj \
|
||||
gimpmenu.obj \
|
||||
gimppatternmenu.obj \
|
||||
gimppatternselect.obj \
|
||||
gimpexport.obj \
|
||||
gimpmiscui.obj \
|
||||
# gimppatheditor.obj \
|
||||
|
|
|
|||
|
|
@ -33,13 +33,7 @@
|
|||
#include <glib-object.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#ifndef S_ISDIR
|
||||
#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
|
||||
#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
|
||||
#endif
|
||||
#ifndef S_IXUSR
|
||||
#define S_IXUSR _S_IEXEC
|
||||
#endif
|
||||
#include <libgimpbase/gimpwin32-io.h>
|
||||
#endif /* G_OS_WIN32 */
|
||||
|
||||
#include "gimpbasetypes.h"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
/*
|
||||
* Compatibilty defines, you mostly need this as unistd.h replacement
|
||||
*/
|
||||
#ifndef __GIMP_WIN32_IO_H__
|
||||
#define __GIMP_WIN32_IO_H__
|
||||
|
||||
#include <io.h>
|
||||
#include <direct.h>
|
||||
|
||||
#define mkdir(n,a) _mkdir(n)
|
||||
|
||||
#define chmod(n,f) _chmod(n,f)
|
||||
|
||||
#ifndef S_ISREG
|
||||
#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
|
||||
#endif
|
||||
#ifndef S_ISDIR
|
||||
#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
|
||||
#endif
|
||||
|
||||
#ifndef S_IRUSR
|
||||
#define S_IRUSR _S_IREAD
|
||||
#endif
|
||||
#ifndef S_IWUSR
|
||||
#define S_IWUSR _S_IWRITE
|
||||
#endif
|
||||
#ifndef S_IXUSR
|
||||
#define S_IXUSR _S_IEXEC
|
||||
#endif
|
||||
|
||||
#ifndef _O_BINARY
|
||||
#define _O_BINARY 0
|
||||
#endif
|
||||
#ifndef _O_TEMPORARY
|
||||
#define _O_TEMPORARY 0
|
||||
#endif
|
||||
|
||||
#ifndef W_OK
|
||||
#define W_OK 2
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
@ -12,6 +12,7 @@ EXPORTS
|
|||
gimp_cmyk_set
|
||||
gimp_cmyk_set_uchar
|
||||
gimp_cmyk_to_rgb
|
||||
gimp_cmyk_to_rgb_int
|
||||
gimp_cmyka_get_uchar
|
||||
gimp_cmyka_set
|
||||
gimp_cmyka_set_uchar
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include "libgimp/stdplugins-intl.h"
|
||||
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#if 0 //def G_OS_WIN32
|
||||
# include <io.h>
|
||||
# ifndef W_OK
|
||||
# define W_OK 2
|
||||
|
|
|
|||
|
|
@ -77,17 +77,7 @@
|
|||
#include <gtk/gtklist.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#include <io.h>
|
||||
|
||||
#ifndef W_OK
|
||||
#define W_OK 2
|
||||
#endif
|
||||
#ifndef S_ISDIR
|
||||
#define S_ISDIR(m) ((m) & _S_IFDIR)
|
||||
#endif
|
||||
#ifndef S_ISREG
|
||||
#define S_ISREG(m) ((m) & _S_IFREG)
|
||||
#endif
|
||||
#include <libgimpbase/gimpwin32-io.h>
|
||||
#endif
|
||||
|
||||
#include "libgimp/stdplugins-intl.h"
|
||||
|
|
|
|||
|
|
@ -44,13 +44,6 @@
|
|||
|
||||
#include "libgimp/stdplugins-intl.h"
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
# include <io.h>
|
||||
# ifndef S_ISREG
|
||||
# define S_ISREG(m) ((m) & _S_IFREG)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include "flame.h"
|
||||
|
||||
#define VARIATION_SAME (-2)
|
||||
|
|
|
|||
|
|
@ -55,13 +55,6 @@ static char rcsid[] = "$Id$";
|
|||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#include <io.h>
|
||||
#ifndef S_ISREG
|
||||
#define S_ISREG(m) ((m) & _S_IFREG)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <libgimpcolor/gimpcolor.h>
|
||||
|
||||
#include <libgimp/gimp.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue