From 6054f2efebb898bbd32ab7388eae7b9ff4357b0a Mon Sep 17 00:00:00 2001
From: Andrey Nakin <andrey.nakin@gmail.com>
Date: 周一, 21 10月 2013 03:50:04 +0800
Subject: [PATCH] Merge remote branch 'upstream/master'

---
 libscpi/inc/scpi/error.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libscpi/inc/scpi/error.h b/libscpi/inc/scpi/error.h
index b2b7c9d..36de436 100644
--- a/libscpi/inc/scpi/error.h
+++ b/libscpi/inc/scpi/error.h
@@ -58,7 +58,8 @@
 #define SCPI_ERROR_INVALID_SUFFIX       -131
 #define SCPI_ERROR_SUFFIX_NOT_ALLOWED   -138
 
-#define SCPI_ERROR_EXECUTION_ERROR      -200    
+#define SCPI_ERROR_EXECUTION_ERROR      -200
+#define SCPI_ERROR_ILLEGAL_PARAMETER_VALUE	-224
     
 #ifdef	__cplusplus
 }

--
Gitblit v1.9.1