diff --git a/ChangeLog b/ChangeLog index 27d3f0001d..8b409cea2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2004-07-30 Sven Neumann + + Applied a bunch of AIX portability fixes (bug #148813): + + * configure.in: when testing for Xmu library, link with -lXt -lX11. + + * app/gui/tips-parser.c + * app/gui/user-install-dialog.c + * app/tools/tools-enums.h + * app/widgets/gimpdasheditor.c + * app/widgets/widgets-enums.h + * libgimpthumb/gimpthumb-error.h + * libgimpwidgets/gimpcolorbutton.c + * plug-ins/common/edge.c: removed trailing commas from enums. + + * plug-ins/common/snoise.c + + * plug-ins/imagemap/imap_cmd_move.c: no C++ style comments. + + * app/paint-funcs/paint-funcs-generic.h + * app/paint-funcs/paint-funcs.c: use integers for bit fields. + 2004-07-30 Sven Neumann * plug-ins/common/bumpmap.c: removed preview code that isn't used diff --git a/app/dialogs/tips-parser.c b/app/dialogs/tips-parser.c index aa22b9007f..cf702ddc35 100644 --- a/app/dialogs/tips-parser.c +++ b/app/dialogs/tips-parser.c @@ -47,7 +47,7 @@ typedef enum { TIPS_LOCALE_NONE, TIPS_LOCALE_MATCH, - TIPS_LOCALE_MISMATCH, + TIPS_LOCALE_MISMATCH } TipsParserLocaleState; typedef struct _TipsParser TipsParser; diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c index 2938ffeb8e..101fa00732 100644 --- a/app/dialogs/user-install-dialog.c +++ b/app/dialogs/user-install-dialog.c @@ -110,7 +110,7 @@ typedef enum { TREE_ITEM_DO_NOTHING, /* Don't pre-create */ TREE_ITEM_MKDIR, /* Create the directory */ - TREE_ITEM_FROM_SYSCONF_DIR, /* Copy from sysconf directory */ + TREE_ITEM_FROM_SYSCONF_DIR /* Copy from sysconf directory */ } TreeItemType; static struct diff --git a/app/gui/tips-parser.c b/app/gui/tips-parser.c index aa22b9007f..cf702ddc35 100644 --- a/app/gui/tips-parser.c +++ b/app/gui/tips-parser.c @@ -47,7 +47,7 @@ typedef enum { TIPS_LOCALE_NONE, TIPS_LOCALE_MATCH, - TIPS_LOCALE_MISMATCH, + TIPS_LOCALE_MISMATCH } TipsParserLocaleState; typedef struct _TipsParser TipsParser; diff --git a/app/gui/user-install-dialog.c b/app/gui/user-install-dialog.c index 2938ffeb8e..101fa00732 100644 --- a/app/gui/user-install-dialog.c +++ b/app/gui/user-install-dialog.c @@ -110,7 +110,7 @@ typedef enum { TREE_ITEM_DO_NOTHING, /* Don't pre-create */ TREE_ITEM_MKDIR, /* Create the directory */ - TREE_ITEM_FROM_SYSCONF_DIR, /* Copy from sysconf directory */ + TREE_ITEM_FROM_SYSCONF_DIR /* Copy from sysconf directory */ } TreeItemType; static struct diff --git a/app/paint-funcs/paint-funcs-generic.h b/app/paint-funcs/paint-funcs-generic.h index 0896f3e1ba..165b5745ff 100644 --- a/app/paint-funcs/paint-funcs-generic.h +++ b/app/paint-funcs/paint-funcs-generic.h @@ -52,8 +52,8 @@ /* FIXME: Move to a more global place */ struct apply_layer_mode_struct { - guchar bytes1 : 3; - guchar bytes2 : 3; + guint bytes1 : 3; + guint bytes2 : 3; guchar *src1; guchar *src2; guchar *mask; diff --git a/app/paint-funcs/paint-funcs.c b/app/paint-funcs/paint-funcs.c index c2ab0fe288..a0804ec6f4 100644 --- a/app/paint-funcs/paint-funcs.c +++ b/app/paint-funcs/paint-funcs.c @@ -56,9 +56,9 @@ typedef enum typedef struct _LayerMode LayerMode; struct _LayerMode { - guchar affect_alpha : 1; /* does the layer mode affect the alpha channel */ - guchar increase_opacity : 1; /* layer mode can increase opacity */ - guchar decrease_opacity : 1; /* layer mode can decrease opacity */ + guint affect_alpha : 1; /* does the layer mode affect the alpha channel */ + guint increase_opacity : 1; /* layer mode can increase opacity */ + guint decrease_opacity : 1; /* layer mode can decrease opacity */ }; static const LayerMode layer_modes[] = diff --git a/app/tools/tools-enums.h b/app/tools/tools-enums.h index 6c5ca27cba..f58ea574f2 100644 --- a/app/tools/tools-enums.h +++ b/app/tools/tools-enums.h @@ -78,7 +78,7 @@ typedef enum { GIMP_VECTOR_MODE_DESIGN, /*< desc="Design" >*/ GIMP_VECTOR_MODE_EDIT, /*< desc="Edit" >*/ - GIMP_VECTOR_MODE_MOVE, /*< desc="Move" >*/ + GIMP_VECTOR_MODE_MOVE /*< desc="Move" >*/ } GimpVectorMode; diff --git a/app/widgets/gimpdasheditor.c b/app/widgets/gimpdasheditor.c index d4d73a6171..553c440781 100644 --- a/app/widgets/gimpdasheditor.c +++ b/app/widgets/gimpdasheditor.c @@ -45,7 +45,7 @@ enum PROP_0, PROP_STROKE_OPTIONS, PROP_N_SEGMENTS, - PROP_LENGTH, + PROP_LENGTH }; diff --git a/app/widgets/widgets-enums.h b/app/widgets/widgets-enums.h index 4d4f8b78f3..7bc78e23b3 100644 --- a/app/widgets/widgets-enums.h +++ b/app/widgets/widgets-enums.h @@ -171,7 +171,7 @@ typedef enum /*< skip >*/ GIMP_PREVIEW_BORDER_BLACK, GIMP_PREVIEW_BORDER_WHITE, GIMP_PREVIEW_BORDER_RED, - GIMP_PREVIEW_BORDER_GREEN, + GIMP_PREVIEW_BORDER_GREEN } GimpPreviewBorderType; typedef enum /*< skip >*/ diff --git a/configure.in b/configure.in index 112144a36a..031f6aec8b 100644 --- a/configure.in +++ b/configure.in @@ -864,7 +864,7 @@ if test "$gdk_target" = x11; then have_libxmu=yes LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt", [AC_MSG_WARN(*** gimp-remote will not be built (XMU header file not found) ***)],[#include ])], - [AC_MSG_WARN(*** gimp-remote will not be built (XMU library not found) ***)], -lXt) + [AC_MSG_WARN(*** gimp-remote will not be built (XMU library not found) ***)], -lXt -lX11) CFLAGS="$gimp_save_CFLAGS" LDFLAGS="$gimp_save_LDFLAGS" fi diff --git a/libgimpthumb/gimpthumb-error.h b/libgimpthumb/gimpthumb-error.h index 3dad385bd6..71fdbec934 100644 --- a/libgimpthumb/gimpthumb-error.h +++ b/libgimpthumb/gimpthumb-error.h @@ -31,7 +31,7 @@ typedef enum { GIMP_THUMB_ERROR_OPEN, /* open failed */ GIMP_THUMB_ERROR_OPEN_ENOENT, /* file does not exist */ - GIMP_THUMB_ERROR_MKDIR, /* mkdir failed */ + GIMP_THUMB_ERROR_MKDIR /* mkdir failed */ } GimpThumbError; diff --git a/libgimpwidgets/gimpcolorbutton.c b/libgimpwidgets/gimpcolorbutton.c index cbcfdfe5b2..e56fe4482e 100644 --- a/libgimpwidgets/gimpcolorbutton.c +++ b/libgimpwidgets/gimpcolorbutton.c @@ -52,7 +52,7 @@ typedef enum GIMP_COLOR_BUTTON_COLOR_FG, GIMP_COLOR_BUTTON_COLOR_BG, GIMP_COLOR_BUTTON_COLOR_BLACK, - GIMP_COLOR_BUTTON_COLOR_WHITE, + GIMP_COLOR_BUTTON_COLOR_WHITE } GimpColorButtonColor; enum diff --git a/plug-ins/common/edge.c b/plug-ins/common/edge.c index 8546602868..9dccc29ad9 100644 --- a/plug-ins/common/edge.c +++ b/plug-ins/common/edge.c @@ -78,7 +78,7 @@ enum GRADIENT, ROBERTS, DIFFERENTIAL, - LAPLACE, + LAPLACE }; typedef struct diff --git a/plug-ins/common/snoise.c b/plug-ins/common/snoise.c index 7e09aa39ca..031d14bb3b 100644 --- a/plug-ins/common/snoise.c +++ b/plug-ins/common/snoise.c @@ -82,8 +82,8 @@ #define WEIGHT(T) ((2.0*fabs(T)-3.0)*(T)*(T)+1.0) #define SCALE_WIDTH 128 -#define SIZE_MIN 0.1 -#define SIZE_MAX 16.0 +#define MIN_SIZE 0.1 +#define MAX_SIZE 16.0 #define PREVIEW_SIZE 128 @@ -447,8 +447,8 @@ solid_noise_init (void) /* Force sane parameters */ snvals.detail = CLAMP (snvals.detail, 0, 15); - snvals.xsize = CLAMP (snvals.xsize, SIZE_MIN, SIZE_MAX); - snvals.ysize = CLAMP (snvals.ysize, SIZE_MIN, SIZE_MAX); + snvals.xsize = CLAMP (snvals.xsize, MIN_SIZE, MAX_SIZE); + snvals.ysize = CLAMP (snvals.ysize, MIN_SIZE, MAX_SIZE); /* Set scaling factors */ if (snvals.tilable) @@ -689,7 +689,7 @@ solid_noise_dialog (void) /* X Size */ adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("_X size:"), SCALE_WIDTH, 0, - snvals.xsize, SIZE_MIN, SIZE_MAX, 0.1, 1.0, 1, + snvals.xsize, MIN_SIZE, MAX_SIZE, 0.1, 1.0, 1, TRUE, 0, 0, NULL, NULL); g_signal_connect (adj, "value_changed", @@ -702,7 +702,7 @@ solid_noise_dialog (void) /* Y Size */ adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 3, _("_Y size:"), SCALE_WIDTH, 0, - snvals.ysize, SIZE_MIN, SIZE_MAX, 0.1, 1.0, 1, + snvals.ysize, MIN_SIZE, MAX_SIZE, 0.1, 1.0, 1, TRUE, 0, 0, NULL, NULL); g_signal_connect (adj, "value_changed", diff --git a/plug-ins/imagemap/imap_cmd_move.c b/plug-ins/imagemap/imap_cmd_move.c index 87ad9ed3ae..19ecdfda04 100644 --- a/plug-ins/imagemap/imap_cmd_move.c +++ b/plug-ins/imagemap/imap_cmd_move.c @@ -152,7 +152,7 @@ button_release(GtkWidget *widget, GdkEventButton *event, gpointer data) command_list_add(object_move_command_new(command->obj, command->obj_x, command->obj_y)); - // preview_thaw(); + /* preview_thaw(); */ } static CmdExecuteValue_t @@ -161,7 +161,7 @@ move_command_execute(Command_t *parent) MoveCommand_t *command = (MoveCommand_t*) parent; GtkWidget *widget = command->preview->preview; - // preview_freeze(); + /* preview_freeze(); */ g_signal_connect(widget, "button_release_event", G_CALLBACK (button_release), command); g_signal_connect(widget, "motion_notify_event",