diff options
| author | Allen Winter <allen.winter@kdab.com> | 2020-11-01 10:37:56 -0500 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2020-11-01 10:37:56 -0500 |
| commit | 84564915950979d3fd66210b12c5c9aedc8314d4 (patch) | |
| tree | 0841d7503bd5ef8c4c9a81f775716fef9c39a9f0 | |
| parent | 6e8ed4a840b2ab31b1b4968b8b66cc8273dbfb5e (diff) | |
| parent | ab2a3b1a8010a1efdf1c3a8eb1ae43e111c87a7c (diff) | |
| download | libical-git-84564915950979d3fd66210b12c5c9aedc8314d4.tar.gz | |
Merge branch '3.0'
| -rw-r--r-- | cmake/modules/GObjectIntrospectionMacros.cmake | 2 | ||||
| -rw-r--r-- | src/libicalvcal/icalvcal.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/modules/GObjectIntrospectionMacros.cmake b/cmake/modules/GObjectIntrospectionMacros.cmake index 1e7ecd79..83aff931 100644 --- a/cmake/modules/GObjectIntrospectionMacros.cmake +++ b/cmake/modules/GObjectIntrospectionMacros.cmake @@ -83,7 +83,7 @@ macro(gir_add_introspections introspections_girs) -o ${CMAKE_CURRENT_BINARY_DIR}/${_typelib} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${gir} OUTPUT ${_typelib} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) list(APPEND _gir_typelibs ${CMAKE_CURRENT_BINARY_DIR}/${_typelib}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_typelib} DESTINATION ${LIB_INSTALL_DIR}/girepository-1.0) diff --git a/src/libicalvcal/icalvcal.c b/src/libicalvcal/icalvcal.c index cfe3d79a..1c330187 100644 --- a/src/libicalvcal/icalvcal.c +++ b/src/libicalvcal/icalvcal.c @@ -55,9 +55,9 @@ enum datatype }; /* The indices must match between the strings and the codes. */ -static const char *weekdays[] = { "SU", "MO", "TU", "WE", "TH", "FR", "SA" }; +static const char weekdays[][3] = { "SU", "MO", "TU", "WE", "TH", "FR", "SA" }; -static int weekday_codes[] = { +static const int weekday_codes[] = { ICAL_SUNDAY_WEEKDAY, ICAL_MONDAY_WEEKDAY, ICAL_TUESDAY_WEEKDAY, |