Commit f67bef8c authored by Tor Lillqvist's avatar Tor Lillqvist
Browse files

First batch of changes to merge the Win32 version.

parent 56924494
1999-02-21 Tor Lillqvist <tml@iki.fi>
First batch of changes to merge the Win32 version. This will be
done in pieces, don't expect to be able to compile on Win32 from
these sources yet. Ans of course, the official version of GTk+
doesn't include the Win32 stuff yet.
* configure.in acconfig.h: Check for <sys/param.h> and
<sys/times.h>. Check for rint().
* app/appenv.h: There shouldn't be any need to include
<gdk/gdkx.h>. GDK hides the windowing system. Thus we cannot use
GDK_DISPLAY either, and the DISPLAY macro must go.
* app/*.c: Guard inclusion of Unix-only headers. Include config.h
(as first header) where needed. Use G_DIR_SEPARATOR(_S) and
G_SEARCHPATH_SEPARATOR(_S) where appropriate.
* app/app_procs.c: Unreference fonts after use.
* app/asupsample.c: Include <stdlib.h> for size_t.
* app/batch.c (batch_init): No batch mode from stdin on Win32.
* app/blob.c app/gimpbrushgenerated.c: Define M_PI if needed.
* app/clone.c app/disp_callbacks.c app/rotate_tool.c
app/scale_tool.c: Use GDK constants instead of Xlib ones (with
identical value).
* app/color_area.c app/color_select.c app/gdisplay.c
app/parasitelist.c app/preferences_dialog.c app/tile_manager.c:
Include <string.h> as we use functions from there.
* app/colormap_dialog.i.c (ipal_draw_cell): Watch out for
allocation width and height calues that are in fact
negative. (This can happen at least on Win32 for some reason.)
* app/datafiles.c: Define S_IS* macros for MSC.
* app/docindex.c: Reorder header files. Otherwise guint32
isn't available for gimpimageF.h, for instance.
* app/docindexif.h: No need to incude <gdk/gdkprivate.h>.
* app/errorconsole.c: Define S_I[RW]USR for MSC.
* app/general.c: Define S_ISREG for MSC.
* app/fileops.c: Include <process.h> and <direct.h> for MSC.
* app/gimpbrushgenerated.c app/paint_funcs.c app/posterize.c:
Define rint() using floor if necessary.
* app/gimpbrushgenerated.c: Use unsigned char for lookup table.
* app/gimpdrawable.c: Use <string.h>, not <strings.h>.
* app/main.c: Conditionalize on signal names.
* app/module_db.c: Include <time.h> for time_t. Handle Win32 DLL
names.
* app/palette.c (palette_create_entries): If no HOME, ignore ~.
* app/procedural_db.c app/tips_dialog.c: No need to open text
files in binary mode.
* app/temp_buf.c: Include <process.h> for MSC.
* app/text_tool.c: Use GDK to get black and white pixel values.
1999-02-19 Tuomas Kuosmanen <tigert@gimp.org>
* plug-ins/tiff/tiff.c (save_dialog): Changed the plugin dialog
......
......@@ -25,12 +25,15 @@
#undef HAVE_NDIR_H
#undef HAVE_PROGRESSIVE_JPEG
#undef HAVE_PUTENV
#undef HAVE_RINT
#undef HAVE_SHM_H
#undef HAVE_STPCPY
#undef HAVE_SYS_DIR_H
#undef HAVE_SYS_NDIR_H
#undef HAVE_SYS_PARAM_H
#undef HAVE_SYS_SELECT_H
#undef HAVE_SYS_TIME_H
#undef HAVE_SYS_TIMES_H
#undef HAVE_UNISTD_H
#undef HAVE_VPRINTF
#undef HAVE_VSNPRINTF
......
......@@ -349,7 +349,10 @@ AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_HEADER_TIME
AC_CHECK_HEADER(sys/param.h, AC_DEFINE(HAVE_SYS_PARAM_H))
AC_CHECK_HEADER(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H))
AC_CHECK_HEADER(sys/times.h, AC_DEFINE(HAVE_SYS_TIMES_H))
AC_CHECK_HEADER(sys/wait.h, AC_DEFINE(HAVE_SYS_WAIT_H))
AC_CHECK_HEADER(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
AC_TYPE_PID_T
......@@ -393,6 +396,11 @@ AC_CHECK_FUNC(difftime, , AC_DEFINE(NO_DIFFTIME))
dnl check for putenv (because %#@&% NeXTStep doesn't have it)
AC_CHECK_FUNC(putenv, AC_DEFINE(HAVE_PUTENV))
dnl check for rint
AC_CHECK_FUNC(rint, AC_DEFINE(HAVE_RINT), [
AC_CHECK_LIB(m, rint, [
AC_DEFINE(HAVE_RINT)])])
dnl check for inline
AC_MSG_CHECKING([for inline definition in glibconfig.h])
AC_EGREP_CPP(glib_defines_inline,
......@@ -652,11 +660,6 @@ gimprc_user
gimprc.5
gimptool
libgimp/gimpfeatures.h
Makefile
po/Makefile.in
intl/Makefile
tools/Makefile
libgimp/Makefile
plug-ins/Makefile
plug-ins/perl/config.pl:plug-ins/perl/etc/config.pl.in
plug-ins/libgck/Makefile
......@@ -808,6 +811,11 @@ data/Makefile
data/brushes/Makefile
data/gradients/Makefile
data/palettes/Makefile
Makefile
po/Makefile.in
intl/Makefile
tools/Makefile
libgimp/Makefile
data/patterns/Makefile],
[
chmod +x gimptool
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment