cpp-ify conf_cookie.c

src/CMakeLists.txt

@@ -166,7 +166,7 @@ if(BUILD_ICONV)
 endif(BUILD_ICONV)
 
 if(BUILD_BUILTIN_CONFIG)
-	 set(optional_sources ${optional_sources} conf_cookie.c)
+	 set(optional_sources ${optional_sources} conf_cookie.cc)
 endif(BUILD_BUILTIN_CONFIG)
 
 add_executable(conky ${conky_sources} ${optional_sources})

src/conf_cookie.cc

@@ -61,14 +61,13 @@ conf_read(void *cookie, char *buf, COOKIE_LEN_T size)
 #endif /* defined(HAVE_FOPENCOOKIE) || defined(HAVE_FUNOPEN) */
 
 #if defined(HAVE_FOPENCOOKIE)
-static cookie_io_functions_t conf_cookie = {
-	.read = &conf_read,
-	.write = NULL,
-	.seek = NULL,
-	.close = NULL,
-};
+static cookie_io_functions_t conf_cookie;
 FILE *conf_cookie_open(void)
 {
+	conf_cookie.read = &conf_read;
+	conf_cookie.write = NULL;
+	conf_cookie.seek = NULL;
+	conf_cookie.close = NULL;
 	return fopencookie(NULL, "r", conf_cookie);
 }
 #elif defined(HAVE_FUNOPEN)

src/conf_cookie.h

@@ -3,14 +3,6 @@
 #ifndef _CONF_COOKIE_H
 #define _CONF_COOKIE_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 FILE *conf_cookie_open(void);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _CONF_COOKIE_H */