mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2026-02-15 22:05:22 -05:00
add globally defined PA_PATH_SEP macro, replacing private per-file macros
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1801 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
6ac66e453f
commit
55d9fcb126
5 changed files with 17 additions and 29 deletions
|
|
@ -42,13 +42,7 @@
|
|||
|
||||
#include "client-conf.h"
|
||||
|
||||
#ifndef OS_IS_WIN32
|
||||
# define PATH_SEP "/"
|
||||
#else
|
||||
# define PATH_SEP "\\"
|
||||
#endif
|
||||
|
||||
#define DEFAULT_CLIENT_CONFIG_FILE PA_DEFAULT_CONFIG_DIR PATH_SEP "client.conf"
|
||||
#define DEFAULT_CLIENT_CONFIG_FILE PA_DEFAULT_CONFIG_DIR PA_PATH_SEP "client.conf"
|
||||
#define DEFAULT_CLIENT_CONFIG_FILE_USER "client.conf"
|
||||
|
||||
#define ENV_CLIENT_CONFIG_FILE "PULSE_CLIENTCONFIG"
|
||||
|
|
|
|||
|
|
@ -64,12 +64,6 @@
|
|||
|
||||
#include "util.h"
|
||||
|
||||
#ifndef OS_IS_WIN32
|
||||
#define PATH_SEP '/'
|
||||
#else
|
||||
#define PATH_SEP '\\'
|
||||
#endif
|
||||
|
||||
char *pa_get_user_name(char *s, size_t l) {
|
||||
char *p;
|
||||
char buf[1024];
|
||||
|
|
@ -217,7 +211,7 @@ char *pa_path_get_filename(const char *p) {
|
|||
|
||||
pa_assert(p);
|
||||
|
||||
if ((fn = strrchr(p, PATH_SEP)))
|
||||
if ((fn = strrchr(p, PA_PATH_SEP_CHAR)))
|
||||
return fn+1;
|
||||
|
||||
return (char*) p;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue