gcc 2.95 compatibility, take 2

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@208 fefdeb5f-60dc-0310-8127-8f9354f1896f

7 files changed, 11 insertions, 9 deletions

diff --git a/configure.ac b/configure.ac
index 8b5a72ab..5239db1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,12 +104,13 @@ AC_SUBST(GLIB12_LIBS)
 AC_SUBST(HAVE_GLIB12)
 AM_CONDITIONAL([HAVE_GLIB12], [test "x$HAVE_GLIB12" = x1])
 
-# If using GCC specifiy some additional parameters
+# If using GCC specify some additional parameters
 if test "x$GCC" = "xyes" ; then
    CFLAGS="$CFLAGS -pipe -W -Wall -pedantic"
 
-   AC_LANG_CONFTEST([int main()])
-   $CC -std=c99 -Wno-unused-parameter -E conftest.c -o - > /dev/null 2>&1 && CFLAGS="$CFLAGS -std=c99 -Wno-unused-parameter"
+   AC_LANG_CONFTEST([int main() {}])
+   $CC -c conftest.c -std=c99 -Wno-unused-parameter $CFLAGS > /dev/null 2> /dev/null && CFLAGS="$CFLAGS -std=c99 -Wno-unused-parameter"
+   rm -f conftest.o
 fi
 
 # LYNX documentation generation
diff --git a/polyp/cpulimit-test.c b/polyp/cpulimit-test.c
index 71c06ef7..d1faf92b 100644
--- a/polyp/cpulimit-test.c
+++ b/polyp/cpulimit-test.c
@@ -80,5 +80,6 @@ int main() {
     pa_cpu_limit_done();
     
     pa_mainloop_free(m);
-    
+
+    return 0;
 }
diff --git a/polyp/log.h b/polyp/log.h
index 1f2c74ef..46a86491 100644
--- a/polyp/log.h
+++ b/polyp/log.h
@@ -6,7 +6,7 @@
 enum pa_log_target {
     PA_LOG_SYSLOG,
     PA_LOG_STDERR,
-    PA_LOG_USER,
+    PA_LOG_USER
 };
 
 void pa_log_set_ident(const char *p);
diff --git a/polyp/polyplib-introspect.h b/polyp/polyplib-introspect.h
index 28c51fed..9e6c31b2 100644
--- a/polyp/polyplib-introspect.h
+++ b/polyp/polyplib-introspect.h
@@ -229,7 +229,7 @@ struct pa_operation* pa_context_unload_module(struct pa_context *c, uint32_t ind
 /** Type of an autoload entry. \since 0.5 */
 enum pa_autoload_type {
     PA_AUTOLOAD_SINK = 0,
-    PA_AUTOLOAD_SOURCE = 1,
+    PA_AUTOLOAD_SOURCE = 1
 };
 
 /** Stores information about autoload entries. \since 0.5 */
diff --git a/polyp/source.h b/polyp/source.h
index b6262835..cda9e698 100644
--- a/polyp/source.h
+++ b/polyp/source.h
@@ -36,7 +36,7 @@ struct pa_source;
 
 enum pa_source_state {
     PA_SOURCE_RUNNING,
-    PA_SOURCE_DISCONNECTED,
+    PA_SOURCE_DISCONNECTED
 };
 
 struct pa_source {
diff --git a/polyp/tagstruct.c b/polyp/tagstruct.c
index 52db0fe3..d571b713 100644
--- a/polyp/tagstruct.c
+++ b/polyp/tagstruct.c
@@ -46,7 +46,7 @@ enum tags {
     TAG_BOOLEAN_TRUE = '1',
     TAG_BOOLEAN_FALSE = '0',
     TAG_TIMEVAL = 'T',
-    TAG_USEC = 'U',  /* 64bit unsigned */
+    TAG_USEC = 'U'  /* 64bit unsigned */
 };
 
 struct pa_tagstruct {
diff --git a/polyp/util.c b/polyp/util.c
index bb71bbf9..24773a7b 100644
--- a/polyp/util.c
+++ b/polyp/util.c
@@ -385,7 +385,7 @@ char *pa_split(const char *c, const char *delimiter, const char**state) {
     *state = current+l;
 
     if (**state)
-        *state++;
+        (*state)++;
 
     return pa_xstrndup(current, l);
 }