[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  914fd13... s3-registry: use some prs macros to the only place where they are used.
      from  196b4e8... s3-waf: fix the build.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 914fd13eddef5cd917a10da1816565acfaa5fd57
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jul 16 02:20:34 2010 +0200

    s3-registry: use some prs macros to the only place where they are used.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/include/smb_macros.h |    4 ----
 source3/registry/regfio.c    |    6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index e5af20b..757c8a2 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -273,8 +273,6 @@ NULL returns on zero request. JRA.
 
 #if defined(PARANOID_MALLOC_CHECKER)
 
-#define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem_((ps),sizeof(type),(count))
-
 /* Get medieval on our ass about malloc.... */
 
 /* Restrictions on malloc/realloc/calloc. */
@@ -311,8 +309,6 @@ NULL returns on zero request. JRA.
 
 #else
 
-#define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem((ps),sizeof(type),(count))
-
 /* Regular malloc code. */
 
 #define SMB_MALLOC(s) malloc(s)
diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index 7a362d2..7ab262d 100644
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -32,6 +32,12 @@
  *
  ******************************************************************/
 
+#if defined(PARANOID_MALLOC_CHECKER)
+#define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem_((ps),sizeof(type),(count))
+#else
+#define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem((ps),sizeof(type),(count))
+#endif
+
 /*******************************************************************
  Reads or writes an NTTIME structure.
 ********************************************************************/


-- 
Samba Shared Repository