[Pcsclite-git-commit] [CCID] 01/05: Move max() definition in a header file

Ludovic Rousseau rousseau at moszumanska.debian.org
Sun Nov 8 21:01:09 UTC 2015


This is an automated email from the git hooks/post-receive script.

rousseau pushed a commit to branch master
in repository CCID.

commit 144a5ff7a61ad3a18c3d4d7ca0ad6639100ee538
Author: Ludovic Rousseau <ludovic.rousseau at free.fr>
Date:   Fri Nov 6 20:37:38 2015 +0100

    Move max() definition in a header file
    
    The max() macro is now defined in defs.h instead of commands.c.
    This allows other .c files to use this macro.
---
 src/commands.c | 1 -
 src/defs.h     | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/commands.c b/src/commands.c
index 30a865b..58a233c 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -55,7 +55,6 @@
  * of 260 bytes since the driver check this value */
 #define BOGUS_SCM_FIRMWARE_FOR_dwMaxCCIDMessageLength
 
-#define max( a, b )   ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
 #ifndef offsetof
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
diff --git a/src/defs.h b/src/defs.h
index 07a02fb..6523de1 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -17,6 +17,8 @@
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#define max( a, b )   ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
+
 #include <pcsclite.h>
 
 #include "openct/proto-t1.h"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pcsclite/CCID.git



More information about the Pcsclite-cvs-commit mailing list