diff options
| author | Lennart Poettering <lennart@poettering.net> | 2004-11-21 17:02:25 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2004-11-21 17:02:25 +0000 |
| commit | b03f39099f27d99158d881419ed65060d5be5643 (patch) | |
| tree | 407d886973c9c7a8e92c952d1ea16f33e9b627b3 /polyp | |
| parent | 966c78ccae42f6632c742d9369aba53c11b10875 (diff) | |
* add some missing "static"s
* include libltdl in distribution
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@302 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp')
| -rw-r--r-- | polyp/Makefile.am | 4 | ||||
| -rw-r--r-- | polyp/daemon-conf.c | 4 | ||||
| -rw-r--r-- | polyp/mainloop.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/polyp/Makefile.am b/polyp/Makefile.am index 13ef893c..6d9962d5 100644 --- a/polyp/Makefile.am +++ b/polyp/Makefile.am @@ -215,9 +215,9 @@ polypaudio_SOURCES = idxset.c idxset.h \ pid.c pid.h polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) -polypaudio_INCLUDES = $(INCLTDL) +polypaudio_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) polypaudio_LDADD = $(AM_LDADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) -polypaudio_LDFLAGS= -export-dynamic -dlopen force #-static $(foreach f,$(modlib_LTLIBRARIES),-dlpreopen $(f)) +polypaudio_LDFLAGS= $(AM_LDFLAGS) -export-dynamic -dlopen force #-static $(foreach f,$(modlib_LTLIBRARIES),-dlpreopen $(f)) libprotocol_simple_la_SOURCES = protocol-simple.c protocol-simple.h libprotocol_simple_la_LDFLAGS = -avoid-version diff --git a/polyp/daemon-conf.c b/polyp/daemon-conf.c index 9728019d..7753da6a 100644 --- a/polyp/daemon-conf.c +++ b/polyp/daemon-conf.c @@ -119,7 +119,7 @@ int pa_daemon_conf_set_resample_method(struct pa_daemon_conf *c, const char *str return 0; } -int parse_log_target(const char *filename, unsigned line, const char *lvalue, const char *rvalue, void *data, void *userdata) { +static int parse_log_target(const char *filename, unsigned line, const char *lvalue, const char *rvalue, void *data, void *userdata) { struct pa_daemon_conf *c = data; assert(filename && lvalue && rvalue && data); @@ -131,7 +131,7 @@ int parse_log_target(const char *filename, unsigned line, const char *lvalue, co return 0; } -int parse_resample_method(const char *filename, unsigned line, const char *lvalue, const char *rvalue, void *data, void *userdata) { +static int parse_resample_method(const char *filename, unsigned line, const char *lvalue, const char *rvalue, void *data, void *userdata) { struct pa_daemon_conf *c = data; assert(filename && lvalue && rvalue && data); diff --git a/polyp/mainloop.c b/polyp/mainloop.c index d530419e..f6bb4145 100644 --- a/polyp/mainloop.c +++ b/polyp/mainloop.c @@ -130,7 +130,7 @@ static void mainloop_io_set_destroy(struct pa_io_event *e, void (*callback)(stru } /* Defer events */ -struct pa_defer_event* mainloop_defer_new(struct pa_mainloop_api*a, void (*callback) (struct pa_mainloop_api*a, struct pa_defer_event *e, void *userdata), void *userdata) { +static struct pa_defer_event* mainloop_defer_new(struct pa_mainloop_api*a, void (*callback) (struct pa_mainloop_api*a, struct pa_defer_event *e, void *userdata), void *userdata) { struct pa_mainloop *m; struct pa_defer_event *e; |