diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 22 | ||||
| -rw-r--r-- | source3/include/smb.h | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 7f6c7d3892..8c7a8a47fe 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -702,17 +702,17 @@ int construct_reply(char *inbuf,char *outbuf,int size,int bufsize); /*The following definitions come from shmem.c */ -BOOL shm_open( char *file_name, int size); -BOOL shm_close( void ); -shm_offset_t shm_alloc(int size); -BOOL shm_free(shm_offset_t offset); -shm_offset_t shm_get_userdef_off(void); -BOOL shm_set_userdef_off(shm_offset_t userdef_off); -void * shm_offset2addr(shm_offset_t offset); -shm_offset_t shm_addr2offset(void *addr); -BOOL shm_lock(void); -BOOL shm_unlock(void); -BOOL shm_get_usage(int *bytes_free, +BOOL smb_shm_open( char *file_name, int size); +BOOL smb_shm_close( void ); +smb_shm_offset_t smb_shm_alloc(int size); +BOOL smb_shm_free(smb_shm_offset_t offset); +smb_shm_offset_t smb_shm_get_userdef_off(void); +BOOL smb_shm_set_userdef_off(smb_shm_offset_t userdef_off); +void * smb_shm_offset2addr(smb_shm_offset_t offset); +smb_shm_offset_t shm_addr2offset(void *addr); +BOOL smb_shm_lock(void); +BOOL smb_shm_unlock(void); +BOOL smb_shm_get_usage(int *bytes_free, int *bytes_used, int *bytes_overhead); diff --git a/source3/include/smb.h b/source3/include/smb.h index bbb477f5f7..543cc73adb 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -55,8 +55,8 @@ typedef int BOOL; /* offset in shared memory */ -typedef int shm_offset_t; -#define NULL_OFFSET (shm_offset_t)(0) +typedef int smb_shm_offset_t; +#define NULL_OFFSET (smb_shm_offset_t)(0) /* @@ -419,7 +419,7 @@ struct interface /* share mode record in shared memory */ typedef struct { - shm_offset_t next_offset; /* offset of next record in list in shared mem */ + smb_shm_offset_t next_offset; /* offset of next record in list in shared mem */ int locking_version; int share_mode; struct timeval time; |