diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
| commit | 0bc538b08ca5c4efea86700cb6c4685da3f34345 (patch) | |
| tree | e5b0fe4b967ecb7e9251faf21904bbbe825aaab7 /src/pulse/version.h.in | |
| parent | b152f3a052eca7225870a7dc4d8a719bee107f0f (diff) | |
| parent | 2654eb7781ddcfe53064745bbad77bffe5c8eada (diff) | |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
src/daemon/daemon-conf.h
src/daemon/main.c
src/pulsecore/dbus-util.h
Diffstat (limited to 'src/pulse/version.h.in')
| -rw-r--r-- | src/pulse/version.h.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in index 3143e98e..c2c1f20a 100644 --- a/src/pulse/version.h.in +++ b/src/pulse/version.h.in @@ -64,8 +64,8 @@ const char* pa_get_library_version(void); * newer than the specified. \since 0.9.16 */ #define PA_CHECK_VERSION(major,minor,micro) \ ((PA_MAJOR > (major)) || \ - (PA_MAJOR == (major) && CA_MINOR > (minor)) || \ - (PA_MAJOR == (major) && CA_MINOR == (minor) && CA_MICRO >= (micro))) + (PA_MAJOR == (major) && PA_MINOR > (minor)) || \ + (PA_MAJOR == (major) && PA_MINOR == (minor) && PA_MICRO >= (micro))) PA_C_DECL_END |