Declare async_read static, since it's not used outside async.c

diff --git a/source/async.c b/source/async.c
index 009630b87085dd34ffb389da7e961a11c4f77da2..9866fdd41949ef52dac0a35021ef63ef1f1934e3 100644 (file)
--- a/source/async.c
+++ b/source/async.c
@@ -11,6 +11,8 @@
 
 #define USE_OPENX_CALL
 
+static int async_read(struct async_context *c);
+
 void list_enqueue(struct list *l, const void *data, int size)
 {
        struct list_item *li =
@@ -135,7 +137,7 @@ static void async_close_recv(struct smbcli_request *req)
                c->cb_close(c->cb_ctx);
 }
 
-int async_read(struct async_context *c)
+static int async_read(struct async_context *c)
 {
        if (!c->io_read) {
                c->io_read = talloc(c->tree, union smb_read);

diff --git a/source/winexe.h b/source/winexe.h
index 8a2538ba9630805531034a8827680d478b4550f0..81c6e3cfe07bd63bc650a2cd4b9e9d5a39b5f7d6 100644 (file)
--- a/source/winexe.h
+++ b/source/winexe.h
@@ -59,7 +59,6 @@ struct async_context {
 };
 
 int async_open(struct async_context *c, const char *fn, int open_mode);
-int async_read(struct async_context *c);
 int async_write(struct async_context *c, const void *buf, int len);
 int async_close(struct async_context *c);
 

diff --git a/source/wscript b/source/wscript
index b6b58107239a8c4341e6c6feb3c288b9b77323ad..41ccc2d1f10703203291cd71f40c625bd7264808 100644 (file)
--- a/source/wscript
+++ b/source/wscript
@@ -20,8 +20,8 @@ def configure(ctx):
     ctx.find_program([ a + '-' + p + '-gcc' for a in ['i386', 'i586'] for p in platform], var='CC_WIN32')
     ctx.find_program([ a + '-' + p + '-gcc' for a in ['x86_64', 'amd64'] for p in platform], var='CC_WIN64')
     ctx.load('compiler_c')
-    os.system('cd ' + samba + ' && ./buildtools/bin/waf configure')
     os.system('cd ' + samba + ' && grep -q "bld.RECURSE(\'../source\')" wscript_build || sed -i "s#bld.RECURSE(\'source3\')#bld.RECURSE(\'source3\')\\nbld.RECURSE(\'../source\')#" wscript_build')
+    os.system('cd ' + samba + ' && ./buildtools/bin/waf configure')
 
 def build(bld):
     if bld.env._SAMBA_BUILD_ == 4: