# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1230564459 0
# Node ID 3cf22779c0cb25a85b90c07447cbc1b4ecbcbc12
# Parent  12046addaec53073d2ffc172542f306833b95e83
merge -c1501 trunk: ecrt_domain_size() const.

diff -r 12046addaec5 -r 3cf22779c0cb NEWS
--- a/NEWS	Mon Dec 29 15:24:37 2008 +0000
+++ b/NEWS	Mon Dec 29 15:27:39 2008 +0000
@@ -22,6 +22,7 @@
 * Restricted licence to GPLv2 only.
 * Fixed spelling of 'PDO', 'SDO' (all uppercase) and 'xx over EtherCAT'
   (without hyphens).
+* Made domain pointer parameter of ecrt_domain_size() const.
 
 Changes in version 1.4.0-rc3:
 
diff -r 12046addaec5 -r 3cf22779c0cb include/ecrt.h
--- a/include/ecrt.h	Mon Dec 29 15:24:37 2008 +0000
+++ b/include/ecrt.h	Mon Dec 29 15:27:39 2008 +0000
@@ -751,7 +751,7 @@
  * \return Size of the process data image.
  */
 size_t ecrt_domain_size(
-        ec_domain_t *domain /**< Domain. */
+        const ec_domain_t *domain /**< Domain. */
         );
 
 /** Provide external memory to store the domain's process data.
diff -r 12046addaec5 -r 3cf22779c0cb master/domain.c
--- a/master/domain.c	Mon Dec 29 15:24:37 2008 +0000
+++ b/master/domain.c	Mon Dec 29 15:27:39 2008 +0000
@@ -336,7 +336,7 @@
 
 /*****************************************************************************/
 
-size_t ecrt_domain_size(ec_domain_t *domain)
+size_t ecrt_domain_size(const ec_domain_t *domain)
 {
     return domain->data_size;
 }