diff options
author | Andrew Tridgell <tridge@samba.org> | 2011-02-18 10:10:30 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 18:41:00 +1100 |
commit | bed374215ff040cc995659d42938be35412a794a (patch) | |
tree | 3d65c515ff6144564eb76b1ce5059f65e2cd7a79 /source4/smbd | |
parent | cfeceedfab64fe8b7f5823d1ada3f6d9b1799adf (diff) | |
download | samba-bed374215ff040cc995659d42938be35412a794a.tar.gz samba-bed374215ff040cc995659d42938be35412a794a.tar.bz2 samba-bed374215ff040cc995659d42938be35412a794a.zip |
s4-idl: rename s4 server_id.idl to server_id4.idl
this avoids a conflict with the new s3 server_id.idl
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/smbd')
-rw-r--r-- | source4/smbd/service_stream.h | 2 | ||||
-rw-r--r-- | source4/smbd/service_task.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/smbd/service_stream.h b/source4/smbd/service_stream.h index 202ea52327..02ade716d2 100644 --- a/source4/smbd/service_stream.h +++ b/source4/smbd/service_stream.h @@ -23,7 +23,7 @@ #ifndef __SERVICE_STREAM_H__ #define __SERVICE_STREAM_H__ -#include "librpc/gen_ndr/server_id.h" +#include "librpc/gen_ndr/server_id4.h" /* modules can use the following to determine if the interface has changed * please increment the version number after each interface change diff --git a/source4/smbd/service_task.h b/source4/smbd/service_task.h index 69ecb1b970..b8954073e5 100644 --- a/source4/smbd/service_task.h +++ b/source4/smbd/service_task.h @@ -22,7 +22,7 @@ #ifndef __SERVICE_TASK_H__ #define __SERVICE_TASK_H__ -#include "librpc/gen_ndr/server_id.h" +#include "librpc/gen_ndr/server_id4.h" struct task_server { struct tevent_context *event_ctx; |