From ef4e7d7b4c318de046cf91ec93dfbda3eb557bf0 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 18 Feb 2009 20:04:09 +0000
Subject: [PATCH] Mini stylistic 3.0 merge.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4624 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 .../generic_midi/generic_midi_control_protocol.cc        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index 90b6b4bda9..ba728193d8 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -17,6 +17,9 @@
 
 */
 
+#define __STDC_FORMAT_MACROS 1
+#include <stdint.h>
+
 #include <algorithm>
 
 #include <pbd/error.h>
@@ -121,7 +124,7 @@ GenericMidiControlProtocol::_send_feedback ()
 	if (end == buf) {
 		return;
 	} 
-	
+
 	_port->write (buf, (int32_t) (end - buf));
 }
 
@@ -228,9 +231,7 @@ GenericMidiControlProtocol::stop_learning (Controllable* c)
 		}
 	}
 	
-	if (dptr) {
-		delete dptr;
-	}
+	delete dptr;
 }
 
 void