summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-09-17 01:19:55 +0200
committerLennart Poettering <lennart@poettering.net>2009-09-17 01:19:55 +0200
commit6b8fdc41693a710a29c4d3851a8c870031f1af88 (patch)
treec39904d477a697760300bea445673bb9f8e90582
parent12f211105e843d8b10f7d2a85d0ef451b7becd9a (diff)
CANCELLED vs. CANCELED
Define CANCELLED as alias for CANCELED
-rw-r--r--src/pulse/def.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pulse/def.h b/src/pulse/def.h
index 1a7da974..e839bd92 100644
--- a/src/pulse/def.h
+++ b/src/pulse/def.h
@@ -95,13 +95,14 @@ static inline int PA_STREAM_IS_GOOD(pa_stream_state_t x) {
typedef enum pa_operation_state {
PA_OPERATION_RUNNING, /**< The operation is still running */
PA_OPERATION_DONE, /**< The operation has been completed */
- PA_OPERATION_CANCELED /**< The operation has been canceled */
+ PA_OPERATION_CANCELLED /**< The operation has been cancelled. Before 0.9.18 this was called PA_OPERATION_CANCELED. That name is still available for compatibility. */
} pa_operation_state_t;
/** \cond fulldocs */
#define PA_OPERATION_RUNNING PA_OPERATION_RUNNING
#define PA_OPERATION_DONE PA_OPERATION_DONE
-#define PA_OPERATION_CANCELED PA_OPERATION_CANCELED
+#define PA_OPERATION_CANCELED PA_OPERATION_CANCELLED
+#define PA_OPERATION_CANCELLED PA_OPERATION_CANCELLED
/** \endcond */
/** An invalid index */