summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Williams <andy@andywilliams.me>2018-01-03 09:21:33 +0000
committerAndy Williams <andy@andywilliams.me>2018-01-03 09:21:33 +0000
commit8e23f6abffc16fdf71c0706c96bda78e6e811b0b (patch)
tree16f320c982e8ce12303a09c2d7580b433082527f
parentc82d565c487b2ddf604f22dbfed4e014bb909678 (diff)
parentee61190af81ede1bb03034395741a900fc55ede9 (diff)
Merge branch 'devs/xartigas/typos'
-rw-r--r--src/lib/eina/eina_main.c2
-rw-r--r--src/lib/eina/eina_promise.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/eina/eina_main.c b/src/lib/eina/eina_main.c
index ccfed1ff38..1a152d0da7 100644
--- a/src/lib/eina/eina_main.c
+++ b/src/lib/eina/eina_main.c
@@ -302,7 +302,7 @@ eina_init(void)
302 eina_cpu_count_internal(); 302 eina_cpu_count_internal();
303 303
304 EINA_ERROR_NOT_MAIN_LOOP = eina_error_msg_static_register("Not in main loop."); 304 EINA_ERROR_NOT_MAIN_LOOP = eina_error_msg_static_register("Not in main loop.");
305 EINA_ERROR_NOT_IMPLEMENTED = eina_error_msg_static_register("Functionallity not implemented."); 305 EINA_ERROR_NOT_IMPLEMENTED = eina_error_msg_static_register("Functionality not implemented.");
306 306
307 eina_log_timing(_eina_log_dom, EINA_LOG_STATE_STOP, EINA_LOG_STATE_INIT); 307 eina_log_timing(_eina_log_dom, EINA_LOG_STATE_STOP, EINA_LOG_STATE_INIT);
308 308
diff --git a/src/lib/eina/eina_promise.h b/src/lib/eina/eina_promise.h
index f2275bee90..cb5c796317 100644
--- a/src/lib/eina/eina_promise.h
+++ b/src/lib/eina/eina_promise.h
@@ -935,7 +935,7 @@ EAPI Eina_Future *eina_future_rejected(Eina_Future_Scheduler *scheduler, Eina_Er
935 * f = eina_future_then_easy(f, .success = _future_cb1, .success_type = EINA_VALUE_TYPE_INT); 935 * f = eina_future_then_easy(f, .success = _future_cb1, .success_type = EINA_VALUE_TYPE_INT);
936 * // _future_cb2 will be executed after _future_cb1() 936 * // _future_cb2 will be executed after _future_cb1()
937 * f = eina_future_then_easy(f, .success = _future_cb2, .success_type = EINA_VALUE_TYPE_STRING); 937 * f = eina_future_then_easy(f, .success = _future_cb2, .success_type = EINA_VALUE_TYPE_STRING);
938 * // _future_cb2 will be executed after _future_cb2() 938 * // _future_cb3 will be executed after _future_cb2()
939 * f = eina_future_then_easy(f, .success = _future_cb3, .success_type = EINA_VALUE_TYPE_DOUBLE); 939 * f = eina_future_then_easy(f, .success = _future_cb3, .success_type = EINA_VALUE_TYPE_DOUBLE);
940 * // If an error happens _future_err will be called 940 * // If an error happens _future_err will be called
941 * eina_future_then_easy(f, .error = _future_err); 941 * eina_future_then_easy(f, .error = _future_err);