Merge branch 'obsd-master'

Conflicts:
	format.c
	osdep-openbsd.c

1 files changed, 4 insertions, 4 deletions

diff --git a/job.c b/job.c
index 957897f3..58160911 100644
--- a/job.c
+++ b/job.c
@@ -32,8 +32,8 @@
  * output.
  */
 
-void	job_callback(struct bufferevent *, short, void *);
-void	job_write_callback(struct bufferevent *, void *);
+static void	job_callback(struct bufferevent *, short, void *);
+static void	job_write_callback(struct bufferevent *, void *);
 
 /* All jobs list. */
 struct joblist	all_jobs = LIST_HEAD_INITIALIZER(all_jobs);
@@ -148,7 +148,7 @@ job_free(struct job *job)
 }
 
 /* Called when output buffer falls below low watermark (default is 0). */
-void
+static void
 job_write_callback(__unused struct bufferevent *bufev, void *data)
 {
 	struct job	*job = data;
@@ -164,7 +164,7 @@ job_write_callback(__unused struct bufferevent *bufev, void *data)
 }
 
 /* Job buffer error callback. */
-void
+static void
 job_callback(__unused struct bufferevent *bufev, __unused short events,
     void *data)
 {