From beb23e5a500acb28378dba3237dd20f43a1c4753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Wed, 27 Dec 2017 08:54:04 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@590
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 src_main/io/pispi.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src_main/io/pispi.cpp b/src_main/io/pispi.cpp
index 48853177..d1e611f3 100644
--- a/src_main/io/pispi.cpp
+++ b/src_main/io/pispi.cpp
@@ -1,9 +1,9 @@
 #include "pispi.h"
 #include "piincludes_p.h"
 #if !defined(WINDOWS) && !defined(MAC_OS)
-#  define PISPI
+#  define PIP_SPI
 #endif
-#ifdef PISPI
+#ifdef PIP_SPI
 # include <fcntl.h>
 # include <sys/ioctl.h>
 # include <linux/spi/spidev.h>
@@ -11,7 +11,7 @@
 
 
 PRIVATE_DEFINITION_START(PISPI)
-#ifdef PISPI
+#ifdef PIP_SPI
 int fd;
 spi_ioc_transfer spi_ioc_tr;
 #endif
@@ -29,7 +29,7 @@ PISPI::PISPI(const PIString & path, uint speed, PIIODevice::DeviceMode mode) : P
 	spi_mode = 0;
 	if (mode == ReadOnly)
 		piCoutObj << "error, SPI can't work in ReadOnly mode";
-#ifdef PISPI
+#ifdef PIP_SPI
 	PRIVATE->fd = 0;
 #endif
 }
@@ -59,7 +59,7 @@ bool PISPI::isParameterSet(PISPI::Parameters parameter) const {
 
 
 bool PISPI::openDevice() {
-#ifdef PISPI
+#ifdef PIP_SPI
 	int ret = 0;
 	//piCoutObj << "open device" << path();
 	PRIVATE->fd = ::open(path().dataAscii(), O_RDWR);
@@ -86,7 +86,7 @@ bool PISPI::openDevice() {
 
 
 bool PISPI::closeDevice() {
-#ifdef PISPI
+#ifdef PIP_SPI
 	if (PRIVATE->fd) ::close(PRIVATE->fd);
 #endif
 	return true;
@@ -102,7 +102,7 @@ int PISPI::readDevice(void * read_to, int max_size) {
 
 
 int PISPI::writeDevice(const void * data, int max_size) {
-#ifdef PISPI
+#ifdef PIP_SPI
 	if (max_size > 0) {
 		if (tx_buf.size_s() != max_size) {
 			tx_buf.resize(max_size);