summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-11-15 23:07:54 +0000
committerAndrew Tridgell <tridge@samba.org>1998-11-15 23:07:54 +0000
commit00ae36ffd8079dc830fb4c7016a1f6ddd96d9b5c (patch)
tree420d7b835ebc1ab8ccf947de6f5c491209359f7e /source3/include
parent62725d1c5cd7f96488854adf2feb5a0c28f2a120 (diff)
downloadsamba-00ae36ffd8079dc830fb4c7016a1f6ddd96d9b5c.tar.gz
samba-00ae36ffd8079dc830fb4c7016a1f6ddd96d9b5c.tar.bz2
samba-00ae36ffd8079dc830fb4c7016a1f6ddd96d9b5c.zip
change ROUNDUP to SMB_ROUNDUP to prevent conflicts with system macros
(This used to be commit d9d44d98ec719b7fc6d5b0fc35bf8727f4cd0372)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/smb.h2
1 files changed, 1 insertions, 1 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