pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/libfetch/files Don't use __BEGIN_DECL/__END_DECL, ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e23bc518b597
branches:  trunk
changeset: 538395:e23bc518b597
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 07 16:34:52 2008 +0000

description:
Don't use __BEGIN_DECL/__END_DECL, just inline them. Ensure that
the external variables are covered as well. Directly include stdio.h.

diffstat:

 net/libfetch/files/fetch.h |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 256a5a550fe3 -r e23bc518b597 net/libfetch/files/fetch.h
--- a/net/libfetch/files/fetch.h        Thu Feb 07 16:30:49 2008 +0000
+++ b/net/libfetch/files/fetch.h        Thu Feb 07 16:34:52 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fetch.h,v 1.1.1.1 2008/02/07 01:48:22 joerg Exp $      */
+/*     $NetBSD: fetch.h,v 1.2 2008/02/07 16:34:52 joerg Exp $  */
 /*-
  * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
@@ -33,6 +33,7 @@
 #define _FETCH_H_INCLUDED
 
 #include <limits.h>
+#include <stdio.h>
 
 #define _LIBFETCH_VER "libfetch/2.0"
 
@@ -90,7 +91,9 @@
 #define        FETCH_URL       18
 #define        FETCH_VERBOSE   19
 
-__BEGIN_DECLS
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
 /* FILE-specific functions */
 FILE           *fetchXGetFile(struct url *, struct url_stat *, const char *);
@@ -131,8 +134,6 @@
 struct url     *fetchParseURL(const char *);
 void            fetchFreeURL(struct url *);
 
-__END_DECLS
-
 /* Authentication */
 typedef int (*auth_t)(struct url *);
 extern auth_t           fetchAuthMethod;
@@ -151,4 +152,8 @@
 /* Extra verbosity */
 extern int              fetchDebug;
 
+#if defined(__cplusplus)
+}
 #endif
+
+#endif



Home | Main Index | Thread Index | Old Index