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

List:       kde-commits
Subject:    ARTS_1_1_BRANCH: arts
From:       George Staikos <staikos () kde ! org>
Date:       2003-09-30 22:48:35
[Download RAW message or body]

CVS commit by staikos: 

xlC compile fixes


  M +5 -0      artsc/artsdsp.c   1.34.2.4
  M +4 -1      flow/gsl/gslcommon.c   1.13.2.3
  M +4 -1      flow/gsl/gslcommon.h   1.10.2.1
  M +1 -1      flow/gsl/gsldatahandle.c   1.8.2.1
  M +6 -2      flow/gsl/gslopmaster.c   1.11.2.2
  M +3 -0      soundserver/artsd.cc   1.43.2.4


--- arts/artsc/artsdsp.c  #1.34.2.3:1.34.2.4
@@ -641,4 +641,9 @@ FILE* fopen(const char *path, const char
 #endif
 
+#else
+
+/* xlC doesn't like empty files */
+void *not_empty_file;
+
 #endif
 /*

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

--- arts/soundserver/artsd.cc  #1.43.2.3:1.43.2.4
@@ -27,4 +27,7 @@
 #include <signal.h>
 #include <math.h>
+#ifdef __xlC__
+#include <fmath.h>
+#endif
 #include <iostream>
 #include <stdio.h>


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