Fix FSF address (Tobias Mueller, #470445)

[platform/upstream/evolution-data-server.git] / camel / camel-string-utils.h

diff --git a/camel/camel-string-utils.h b/camel/camel-string-utils.h
index 51dbd79..4d2a7c6 100644 (file)
--- a/camel/camel-string-utils.h
+++ b/camel/camel-string-utils.h
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
@@ -24,13 +24,10 @@
 #ifndef __CAMEL_STRING_UTILS_H__
 #define __CAMEL_STRING_UTILS_H__
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 int   camel_strcase_equal (gconstpointer a, gconstpointer b);
 guint camel_strcase_hash  (gconstpointer v);
 
@@ -46,8 +43,6 @@ const char *camel_pstring_add (char *str, gboolean own);
 const char *camel_pstring_strdup(const char *s);
 void camel_pstring_free(const char *s);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __CAMEL_STRING_UTILS_H__ */