[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: ARTS_1_1_BRANCH: arts
From:       Marcus Camen <mcamen () mcamen ! de>
Date:       2003-10-01 16:31:49
[Download RAW message or body]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Is the #ifndef really necessary here?
The const also breaks aCC and MipsPro and seems to be unnecessary for GCC.

- --
Marcus

> CVS commit by staikos:
>
> --- arts/flow/gsl/gslcommon.c  #1.13.2.2:1.13.2.3
> @@ -68,5 +68,8 @@ static GTrashStack *simple_cache[SIMPLE_
>  static gulong       memory_allocated = 0;
>
> -const guint
> +#ifndef __xlC__
> +const
> +#endif
> +guint
>  gsl_alloc_upper_power2 (const gulong number)
>  {
>
> --- arts/flow/gsl/gslcommon.h  #1.10:1.10.2.1
> @@ -242,5 +242,8 @@ void		gsl_free_memblock	(gsize		 size,
>                                           gpointer        memblock);
>  void            gsl_alloc_report        (void);
> -const guint     gsl_alloc_upper_power2  (const gulong    number);
> +#ifndef __xlC__
> +const
> +#endif
> +guint   gsl_alloc_upper_power2  (const gulong    number);
>  void           _gsl_tick_stamp_inc      (void);
>  void           _gsl_tick_stamp_set_leap (guint           ticks);
>
> --- arts/flow/gsl/gsldatahandle.c  #1.8:1.8.2.1
> @@ -949,5 +949,5 @@ gsl_data_handle_new_dcached (GslDataCach
>
>  /* --- wave handle --- */
> -static inline const guint G_GNUC_CONST
> +static inline guint G_GNUC_CONST
>  wave_format_bit_depth (const GslWaveFormatType format)
>  {
>
> --- arts/flow/gsl/gslopmaster.c  #1.11.2.1:1.11.2.2
> @@ -79,5 +79,8 @@ static gboolean	       master_need_reflo
>  static gboolean        master_need_process = FALSE;
>  static EngineNode     *master_consumer_list = NULL;
> -const gfloat          
> gsl_engine_master_zero_block[GSL_STREAM_MAX_VALUES] = { 0, }; /* FIXME
> */ +#ifndef __xlC__
> +const
> +#endif
> +gfloat           gsl_engine_master_zero_block[GSL_STREAM_MAX_VALUES] =
> { 0, }; /* FIXME */ static Poll           *master_poll_list = NULL;
>  static guint           master_n_pollfds = 0;
> @@ -745,10 +748,11 @@ _engine_master_thread (gpointer data)
>
>    /* assert sane configuration checks, since we're simply casting
> structures */ +#ifdef _AIX
>    g_assert (sizeof (struct pollfd) == sizeof (GPollFD) &&
>              G_STRUCT_OFFSET (GPollFD, fd) == G_STRUCT_OFFSET (struct
> pollfd, fd) && -#ifdef _AIX
>              G_STRUCT_OFFSET (GPollFD, events) == G_STRUCT_OFFSET
> (struct pollfd, reqevents) && G_STRUCT_OFFSET (GPollFD, revents) ==
> G_STRUCT_OFFSET (struct pollfd, rtnevents)); #else
> +  g_assert (sizeof (struct pollfd) == sizeof (GPollFD) &&
>              G_STRUCT_OFFSET (GPollFD, events) == G_STRUCT_OFFSET
> (struct pollfd, events) && G_STRUCT_OFFSET (GPollFD, revents) ==
> G_STRUCT_OFFSET (struct pollfd, revents));
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQE/ewF1lP3stiSSHvoRApsUAJ43Qw6O6bpwwUS0oLDum1lHDEKifACdGrRB
vHFm7qcOEYNlS0jmgGLkl1s=
=VINS
-----END PGP SIGNATURE-----

[prev in list] [next in list] [prev in thread] [next in thread]