Skip to content

Commit

Permalink
Merge pull request #872 from skliper/fix846-es-error-code-duplicate
Browse files Browse the repository at this point in the history
Fix #846, Deconflict CFE_ES_LIB_ALREADY_LOADED and CFE_ES_ERR_SYS_LOG_TRUNCATED
  • Loading branch information
yammajamma committed Sep 10, 2020
2 parents db82929 + 7adc055 commit d4a4211
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fsw/cfe-core/src/inc/cfe_error.h
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@
* due to insufficient space in the log buffer.
*
*/
#define CFE_ES_ERR_SYS_LOG_TRUNCATED ((int32)0x44000028)
#define CFE_ES_ERR_SYS_LOG_TRUNCATED ((int32)0x44000029)

/**
* @brief Not Implemented
Expand Down

0 comments on commit d4a4211

Please sign in to comment.