From 96f23737e877fa29efa1f1d9b03131fbc4ee1667 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 15:54:50 +0800
Subject: [PATCH] Merge branch 'master' into feature/SCPI_99_21_8_Device_dependent_error_information_73

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

diff --git a/libscpi/inc/scpi/constants.h b/libscpi/inc/scpi/constants.h
index e2ad2d0..ecbfb55 100644
--- a/libscpi/inc/scpi/constants.h
+++ b/libscpi/inc/scpi/constants.h
@@ -51,7 +51,7 @@
 /* 21.8 :ERRor Subsystem
  * The maximum string length of <Error/event_description> plus <Device-dependent_info> is 255 characters.
  */
-#define SCPI_STD_ERROR_DESC_CHARS_LIMIT 255
+#define SCPI_STD_ERROR_DESC_MAX_STRING_LENGTH 255
 
 #ifdef	__cplusplus
 }

--
Gitblit v1.9.1