From 00ae36ffd8079dc830fb4c7016a1f6ddd96d9b5c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 15 Nov 1998 23:07:54 +0000
Subject: change ROUNDUP to SMB_ROUNDUP to prevent conflicts with system macros
 (This used to be commit d9d44d98ec719b7fc6d5b0fc35bf8727f4cd0372)

---
 source3/include/smb.h |  2 +-
 source3/smbd/reply.c  |  2 +-
 source3/smbd/trans2.c | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source3/include/smb.h b/source3/include/smb.h
index e94d45bf07..0f1683e3c9 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1517,7 +1517,7 @@ enum ssl_version_enum {SMB_SSL_V2,SMB_SSL_V3,SMB_SSL_V23,SMB_SSL_TLS1};
 /* this is how errors are generated */
 #define UNIXERROR(defclass,deferror) unix_error_packet(inbuf,outbuf,defclass,deferror,__LINE__)
 
-#define ROUNDUP(x,g) (((x)+((g)-1))&~((g)-1))
+#define SMB_ROUNDUP(x,g) (((x)+((g)-1))&~((g)-1))
 
 /*
  * Global value meaing that the smb_uid field should be
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index d3131b5fea..d466884ab6 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4129,7 +4129,7 @@ int reply_getattrE(connection_struct *conn, char *inbuf,char *outbuf, int dum_si
   else
     {
       SIVAL(outbuf,smb_vwv6,(uint32)sbuf.st_size);
-      SIVAL(outbuf,smb_vwv8,ROUNDUP(sbuf.st_size,1024));
+      SIVAL(outbuf,smb_vwv8,SMB_ROUNDUP(sbuf.st_size,1024));
     }
   SSVAL(outbuf,smb_vwv10, mode);
   
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index fdd3652cf7..f1d415e290 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -418,7 +418,7 @@ static int get_lanman2_dir_entry(connection_struct *conn,
       put_dos_date2(p,l1_fdateLastAccess,adate);
       put_dos_date2(p,l1_fdateLastWrite,mdate);
       SIVAL(p,l1_cbFile,(uint32)size);
-      SIVAL(p,l1_cbFileAlloc,ROUNDUP(size,1024));
+      SIVAL(p,l1_cbFileAlloc,SMB_ROUNDUP(size,1024));
       SSVAL(p,l1_attrFile,mode);
       SCVAL(p,l1_cchName,strlen(fname));
       pstrcpy(p + l1_achName, fname);
@@ -436,7 +436,7 @@ static int get_lanman2_dir_entry(connection_struct *conn,
       put_dos_date2(p,l2_fdateLastAccess,adate);
       put_dos_date2(p,l2_fdateLastWrite,mdate);
       SIVAL(p,l2_cbFile,(uint32)size);
-      SIVAL(p,l2_cbFileAlloc,ROUNDUP(size,1024));
+      SIVAL(p,l2_cbFileAlloc,SMB_ROUNDUP(size,1024));
       SSVAL(p,l2_attrFile,mode);
       SIVAL(p,l2_cbList,0); /* No extended attributes */
       SCVAL(p,l2_cchName,strlen(fname));
@@ -451,7 +451,7 @@ static int get_lanman2_dir_entry(connection_struct *conn,
       put_dos_date2(p,8,adate);
       put_dos_date2(p,12,mdate);
       SIVAL(p,16,(uint32)size);
-      SIVAL(p,20,ROUNDUP(size,1024));
+      SIVAL(p,20,SMB_ROUNDUP(size,1024));
       SSVAL(p,24,mode);
       SIVAL(p,26,4);
       CVAL(p,30) = strlen(fname);
@@ -470,7 +470,7 @@ static int get_lanman2_dir_entry(connection_struct *conn,
       put_dos_date2(p,8,adate);
       put_dos_date2(p,12,mdate);
       SIVAL(p,16,(uint32)size);
-      SIVAL(p,20,ROUNDUP(size,1024));
+      SIVAL(p,20,SMB_ROUNDUP(size,1024));
       SSVAL(p,24,mode);
       CVAL(p,32) = strlen(fname);
       pstrcpy(p + 33, fname);
@@ -1335,7 +1335,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn,
       put_dos_date2(pdata,l1_fdateLastAccess,sbuf.st_atime);
       put_dos_date2(pdata,l1_fdateLastWrite,sbuf.st_mtime); /* write time */
       SIVAL(pdata,l1_cbFile,(uint32)size);
-      SIVAL(pdata,l1_cbFileAlloc,ROUNDUP(size,1024));
+      SIVAL(pdata,l1_cbFileAlloc,SMB_ROUNDUP(size,1024));
       SSVAL(pdata,l1_attrFile,mode);
       SIVAL(pdata,l1_attrFile+2,4); /* this is what OS2 does */
       break;
@@ -1346,7 +1346,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn,
       put_dos_date2(pdata,4,sbuf.st_atime);
       put_dos_date2(pdata,8,sbuf.st_mtime);
       SIVAL(pdata,12,(uint32)size);
-      SIVAL(pdata,16,ROUNDUP(size,1024));
+      SIVAL(pdata,16,SMB_ROUNDUP(size,1024));
       SIVAL(pdata,20,mode);
       break;
 
-- 
cgit