Merge lp:~compiz-team/compiz/compiz.fix_1065687 into lp:compiz/0.9.9

[Sam Spilsbury]

Use abort () instead of assert (0); The latter doesn't seem to work
sometimes, and really, we want to abort (), the test assumes it.

(LP: #1085687)

Use abort () instead of assert (0); The latter doesn't seem to work
sometimes, and really, we want to abort (), the test assumes it.

(LP: #1085687)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3495
http://jenkins.qa.ubuntu.com/job/compiz-ci/284/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/284/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/284//rebuild/?

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Well assert() is only temporary. It gets converted to an empty expression ifdef NDEBUG. That might be the problem in some release build environment.

review: Approve

=== modified file 'compizconfig/libcompizconfig/src/main.c'
--- compizconfig/libcompizconfig/src/main.c	2012-11-27 06:12:15 +0000
+++ compizconfig/libcompizconfig/src/main.c	2012-12-02 18:39:21 +0000
@@ -187,7 +187,7 @@
 	      "This is either a programmer error or more than one static library \n"
 	      "defining this interface has been linked in\n"
 	      "Unable to continue, please file a bug about this\n", interface_type, object);
-    assert (0);
+    abort ();
 
     return NULL;
 }