Applied a bunch of AIX portability fixes (bug #148813):

2004-07-30  Sven Neumann  <sven@gimp.org>

	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.
This commit is contained in:
Sven Neumann 2004-07-30 00:57:22 +00:00 committed by Sven Neumann
parent 7f60cbf082
commit c6cbd6d335
16 changed files with 46 additions and 24 deletions

View File

@ -1,3 +1,25 @@
2004-07-30 Sven Neumann <sven@gimp.org>
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 <sven@gimp.org>
* plug-ins/common/bumpmap.c: removed preview code that isn't used

View File

@ -47,7 +47,7 @@ typedef enum
{
TIPS_LOCALE_NONE,
TIPS_LOCALE_MATCH,
TIPS_LOCALE_MISMATCH,
TIPS_LOCALE_MISMATCH
} TipsParserLocaleState;
typedef struct _TipsParser TipsParser;

View File

@ -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

View File

@ -47,7 +47,7 @@ typedef enum
{
TIPS_LOCALE_NONE,
TIPS_LOCALE_MATCH,
TIPS_LOCALE_MISMATCH,
TIPS_LOCALE_MISMATCH
} TipsParserLocaleState;
typedef struct _TipsParser TipsParser;

View File

@ -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

View File

@ -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;

View File

@ -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[] =

View File

@ -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;

View File

@ -45,7 +45,7 @@ enum
PROP_0,
PROP_STROKE_OPTIONS,
PROP_N_SEGMENTS,
PROP_LENGTH,
PROP_LENGTH
};

View File

@ -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 >*/

View File

@ -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 <gdk/gdkx.h>])],
[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

View File

@ -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;

View File

@ -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

View File

@ -78,7 +78,7 @@ enum
GRADIENT,
ROBERTS,
DIFFERENTIAL,
LAPLACE,
LAPLACE
};
typedef struct

View File

@ -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",

View File

@ -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",