From: Andre Noll <maan@tuebingen.mpg.de>
Date: Thu, 13 Jul 2017 15:21:13 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.6.1~69
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=8d106ca317a2c42f35a86ba244f843688f6939e6;p=paraslash.git

Merge branch 'maint'

A single important fix for the error subsystem. The merge conflicted
because master removed the E_AAC_AFH_INIT error code while maint
still has it. The conflict was trivial to resolve.

* refs/heads/maint:
  Let error codes start out at index 1.
---

8d106ca317a2c42f35a86ba244f843688f6939e6
diff --cc error.h
index ea8f82c4,97d67817..407859ca
--- a/error.h
+++ b/error.h
@@@ -8,6 -8,8 +8,7 @@@
  
  /** Codes and messages. */
  #define PARA_ERRORS \
+ 	PARA_ERROR(SUCCESS, "success"), \
 -	PARA_ERROR(AAC_AFH_INIT, "failed to init aac decoder"), \
  	PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
  	PARA_ERROR(AAC_DECODE, "aac decode error"), \
  	PARA_ERROR(ACL_PERM, "access denied by acl"), \