[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r2800 - in GNUnet: . contrib doc src/include
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r2800 - in GNUnet: . contrib doc src/include |
|
Date: |
Sat, 13 May 2006 19:04:03 -0700 (PDT) |
Author: grothoff
Date: 2006-05-13 19:03:51 -0700 (Sat, 13 May 2006)
New Revision: 2800
Removed:
GNUnet/contrib/cvs-diff-mail-report-script
GNUnet/contrib/embedded
GNUnet/contrib/gprof-helper.c
Modified:
GNUnet/ChangeLog
GNUnet/contrib/namespacehelper.sh
GNUnet/doc/memoryuse.txt
GNUnet/src/include/core.h
GNUnet/src/include/gnunet_blockstore.h
GNUnet/src/include/gnunet_bootstrap_service.h
GNUnet/src/include/gnunet_core.h
GNUnet/src/include/gnunet_datastore_service.h
GNUnet/src/include/gnunet_dht.h
GNUnet/src/include/gnunet_dht_datastore_memory.h
GNUnet/src/include/gnunet_dht_lib.h
GNUnet/src/include/gnunet_dht_service.h
GNUnet/src/include/gnunet_ecrs_lib.h
GNUnet/src/include/gnunet_fragmentation_service.h
GNUnet/src/include/gnunet_fs_lib.h
GNUnet/src/include/gnunet_fsui_lib.h
GNUnet/src/include/gnunet_gap_service.h
GNUnet/src/include/gnunet_getoption_lib.h
GNUnet/src/include/gnunet_identity_service.h
GNUnet/src/include/gnunet_kvstore_service.h
GNUnet/src/include/gnunet_pingpong_service.h
GNUnet/src/include/gnunet_protocols.h
GNUnet/src/include/gnunet_rpc_service.h
GNUnet/src/include/gnunet_session_service.h
GNUnet/src/include/gnunet_sqstore_service.h
GNUnet/src/include/gnunet_stats_lib.h
GNUnet/src/include/gnunet_stats_service.h
GNUnet/src/include/gnunet_topology_service.h
GNUnet/src/include/gnunet_traffic_lib.h
GNUnet/src/include/gnunet_traffic_service.h
GNUnet/src/include/gnunet_transport.h
GNUnet/src/include/gnunet_transport_service.h
GNUnet/src/include/gnunet_util.h
Log:
cpp friendly headers
Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog 2006-05-14 02:02:12 UTC (rev 2799)
+++ GNUnet/ChangeLog 2006-05-14 02:03:51 UTC (rev 2800)
@@ -1,5 +1,8 @@
+Sat May 13 19:35:49 PDT 2006
+ Made headers more C++ friendly.
+
Wed May 10 22:11:17 PDT 2006
- Fixing bug that possibly resulted in hanging the UDP transport;
+ Fixing bug that could result in hanging the UDP transport;
found by Luigi Auriemma (thanks!).
Sat May 6 00:17:59 PDT 2006
Deleted: GNUnet/contrib/cvs-diff-mail-report-script
===================================================================
--- GNUnet/contrib/cvs-diff-mail-report-script 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/contrib/cvs-diff-mail-report-script 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Something's wrong with this script, it only mails the diff of the first file
that
-# is modified. How to fix?
-# DEFAULT (echo ""; id -un; echo %{sVv}; set; date; cat) |
/home/grothoff/bin/maillog
-read
-read
-USERNAME=$REPLY
-read
-DIFFLINE=$REPLY
-MODULE=`echo $DIFFLINE | awk '{ print $1} '`
-FILE=`echo $DIFFLINE | sed -e "s/,/ /g" | awk '{ print $2 }'`
-REV1=`echo $DIFFLINE | sed -e "s/,/ /g" | awk '{ print $3 }'`
-REV2=`echo $DIFFLINE | sed -e "s/,/ /g" | awk '{ print $4 }'`
-#set | mail -s debug address@hidden
-( echo "$USERNAME changed $FILE (from $REV1 to $REV2)."; date; rcsdiff -r$REV1
-r$REV2 -u /home/cvs/GNUnet/$MODULE/$FILE 2>1 ; cat ) | mail -s "CVS update to
$MODULE" address@hidden
Deleted: GNUnet/contrib/embedded
===================================================================
--- GNUnet/contrib/embedded 2006-05-14 02:02:12 UTC (rev 2799)
+++ GNUnet/contrib/embedded 2006-05-14 02:03:51 UTC (rev 2800)
@@ -1,44 +0,0 @@
-Size estimates for a stripped, minimal-size GNUnet distribution for
-embedded devices (listing only what is required for AFS with DHT, no
-GUI):
-
-binaries:
-gnunetd: 13k
-gnunet-search: 10k
-gnunet-download: 10k
-gnunet-insert: 20k
-TOTAL: 53k
-
-libraries (libgnunet*.so):
-util: 173k (!) [ lots of strings, incl. ~30k gnunet.conf files; could be
reduced ]
-ecrs: 60k
-fs: 13k
-fsui: 34k
-core: 52k
-getoption_api: 5k
-dht_datastore_memory: 7k
-TOTAL: 344k
-
-plugins (libgnunetmodule*):
-gap: 20k
-fs: 28k
-datastore: 14k
-bootstrap: 8k
-advertising: 14k
-fragmentation: 10k
-getoption: 5k
-identity: 17k
-pingpong: 8k
-session: 10k
-sqstore_sqlite: 22k?
-topology: 8k
-traffic: 10k
-transport: 13k
-tcp: 20k
-udp: 13k
-dht: 54k
-rpc: 23k
-TOTAL: 297k [ dht and rpc are optional, - 77k ]
-
-DISTRIBUTION SIZE: 694k (+ dependencies)
-WITH CHANGES: - 107k = 587k (+ dependencies)
Deleted: GNUnet/contrib/gprof-helper.c
===================================================================
--- GNUnet/contrib/gprof-helper.c 2006-05-14 02:02:12 UTC (rev 2799)
+++ GNUnet/contrib/gprof-helper.c 2006-05-14 02:03:51 UTC (rev 2800)
@@ -1,119 +0,0 @@
-/* gprof-helper.c -- preload library to profile pthread-enabled programs
- * *
- * * Authors: Sam Hocevar <sam at zoy dot org>
- * * Daniel J�nsson <danieljo at fagotten dot org>
- * *
- * * This program is free software; you can redistribute it and/or
- * * modify it under the terms of the Do What The Fuck You Want To
- * * Public License as published by Banlu Kemiyatorn. See
- * * http://sam.zoy.org/projects/COPYING.WTFPL for more details.
- * *
- * * Compilation example:
- * * gcc -shared -fPIC gprof-helper.c -o gprof-helper.so -lpthread
-ldl
- * *
- * * Usage example:
- * * LD_PRELOAD=./gprof-helper.so your_program
- * */
-
-#define _GNU_SOURCE
-#include <sys/time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <pthread.h>
-
-static void * wrapper_routine(void *);
-
-/* Original pthread function */
-static int (*pthread_create_orig)(pthread_t *__restrict,
- __const pthread_attr_t
*__restrict,
-
void *(*)(void *),
-
void *__restrict) = NULL;
-
-/* Library initialization function */
-void wooinit(void) __attribute__((constructor));
-
-void wooinit(void)
-{
- pthread_create_orig = dlsym(RTLD_NEXT, "pthread_create");
- fprintf(stderr, "pthreads: using profiling hooks for gprof\n");
- if(pthread_create_orig == NULL)
- {
- char *error = dlerror();
- if(error == NULL)
- {
-
error = "pthread_create is NULL";
-
}
- fprintf(stderr,
"%s\n", error);
-
exit(EXIT_FAILURE);
- }
-}
-
-/* Our data structure passed to the wrapper */
-typedef struct wrapper_s
-{
- void * (*start_routine)(void *);
- void * arg;
-
- pthread_mutex_t lock;
- pthread_cond_t wait;
-
- struct itimerval itimer;
-
-} wrapper_t;
-
-/* The wrapper function in charge for setting the itimer value */
-static void * wrapper_routine(void * data)
-{
- /* Put user data in thread-local variables */
- void * (*start_routine)(void *) =
((wrapper_t*)data)->start_routine;
- void * arg = ((wrapper_t*)data)->arg;
-
- /* Set the profile timer value */
- setitimer(ITIMER_PROF, &((wrapper_t*)data)->itimer, NULL);
-
- /* Tell the calling thread that we don't need its data
anymore */
- pthread_mutex_lock(&((wrapper_t*)data)->lock);
- pthread_cond_signal(&((wrapper_t*)data)->wait);
-
pthread_mutex_unlock(&((wrapper_t*)data)->lock);
-
- /* Call the real function */
- return start_routine(arg);
-}
-
-/* Our wrapper function for the real pthread_create() */
-int pthread_create(pthread_t *__restrict thread,
- __const pthread_attr_t *__restrict attr,
- void *
(*start_routine)(void *),
- void
*__restrict arg)
-{
- wrapper_t wrapper_data;
- int i_return;
-
- /* Initialize the wrapper structure */
- wrapper_data.start_routine = start_routine;
- wrapper_data.arg = arg;
- getitimer(ITIMER_PROF, &wrapper_data.itimer);
- pthread_cond_init(&wrapper_data.wait, NULL);
- pthread_mutex_init(&wrapper_data.lock,
NULL);
- pthread_mutex_lock(&wrapper_data.lock);
-
- /* The real pthread_create call */
- i_return =
pthread_create_orig(thread,
-
attr,
-
&wrapper_routine,
-
&wrapper_data);
-
- /* If the thread was
successfully spawned, wait for the data
- * * to be released */
- if(i_return == 0)
- {
-
pthread_cond_wait(&wrapper_data.wait, &wrapper_data.lock);
-
}
-
-
pthread_mutex_unlock(&wrapper_data.lock);
-
pthread_mutex_destroy(&wrapper_data.lock);
-
pthread_cond_destroy(&wrapper_data.wait);
-
- return
i_return;
-}
Modified: GNUnet/contrib/namespacehelper.sh
===================================================================
--- GNUnet/contrib/namespacehelper.sh 2006-05-14 02:02:12 UTC (rev 2799)
+++ GNUnet/contrib/namespacehelper.sh 2006-05-14 02:03:51 UTC (rev 2800)
@@ -1,4 +1,8 @@
#!/bin/bash
+# THIS SCRIPT DOES NOT WORK WITH THE 0.7.0 SERIES. SOME
+# NECESSARY FEATURES ARE MISSING IN GNUNET-INSERT IN ORDER
+# TO MAKE IT WORK!
+#
#
# This helper script can be used to create and maintain
# _regularly updated_ namespace entries. The configuration phase is
@@ -76,13 +80,8 @@
SEARCH="gnunet-search"
INSERT="gnunet-insert"
-# if required, use
-# INSERT="gnunet-insert -p [your pseudonym password]"
LISTPSEUDO="gnunet-pseudonym-list"
-# if required, use
-# LISTPSEUDO="gnunet-pseudonym-list -p [your pseudonym password]"
-
## [ PROBABLY NO USER-SERVICEABLE PARTS BELOW ]########################
@@ -111,15 +110,15 @@
echo $BLURB >$TMPFILE
echo Feedback channel : $FEEDBACK >>$TMPFILE
- $INSERT -nVXx -m "text/plain" -f "$TITLE.txt" $ADVERTISEKEYS -D
"$BLURB" "$TMPFILE"
+ $INSERT -nV -m "mimetype:text/plain" -m "title:$TITLE.txt"
$ADVERTISEKEYS -m "description:$BLURB" "$TMPFILE"
;;
create)
echo 1st time indexing dir $BASEDIR under $ACCESSKEY
- $INSERT -VbrX -s $PSEUDONYM -o "$STOREDBLOCK" -t $ACCESSKEY -i
$INTERVALSECS -D "$DESCRIPTION" "$BASEDIR"
+ $INSERT -VR -P $PSEUDONYM -o "$STOREDBLOCK" -t $ACCESSKEY -i
$INTERVALSECS -m "description:$DESCRIPTION" "$BASEDIR"
;;
update)
echo Updating entry $ACCESSKEY with $BASEDIR ...
- $INSERT -VbrX -s $PSEUDONYM -e "$STOREDBLOCK" -o "$STOREDBLOCK"
"$BASEDIR"
+ $INSERT -VR -P $PSEUDONYM -e "$STOREDBLOCK" -o "$STOREDBLOCK"
"$BASEDIR"
;;
scan)
echo Scanning for messages ...
Modified: GNUnet/doc/memoryuse.txt
===================================================================
--- GNUnet/doc/memoryuse.txt 2006-05-14 02:02:12 UTC (rev 2799)
+++ GNUnet/doc/memoryuse.txt 2006-05-14 02:03:51 UTC (rev 2800)
@@ -37,3 +37,49 @@
the VALGRIND option will disable unloading plugins (see
src/util/dso.c) and thus improve the traces significantly.
+
+
+(rough) size estimates for a stripped, minimal-size GNUnet
+distribution for embedded devices (listing only what is required for
+anonymous file-sharing with DHT, no GUI):
+
+binaries:
+gnunetd: 13k
+gnunet-search: 10k
+gnunet-download: 10k
+gnunet-insert: 20k
+TOTAL: 53k
+
+libraries (libgnunet*.so):
+util: 146k
+ecrs: 75k
+fs : 14k
+fsui: 60k
+core: 72k
+getoption_api: 5k
+dht_datastore_memory: 7k
+TOTAL: 379k
+
+plugins (libgnunetmodule*):
+gap: 30k
+fs: 35k
+datastore: 14k
+bootstrap: 9k
+advertising: 16k
+fragmentation: 10k
+getoption: 5k
+identity: 22k
+pingpong: 9k
+session: 11k
+sqstore_sqlite: 22k
+topology: 8k
+traffic: 10k
+transport: 13k
+tcp: 22k
+udp: 15k
+dht: 57k
+rpc: 23k
+TOTAL: ~330k [ dht and rpc are optional, - 80k ]
+
+DISTRIBUTION SIZE: ~700k (+ dependencies [sqlite, libc, libextractor])
+
Modified: GNUnet/src/include/core.h
===================================================================
--- GNUnet/src/include/core.h 2006-05-14 02:02:12 UTC (rev 2799)
+++ GNUnet/src/include/core.h 2006-05-14 02:03:51 UTC (rev 2800)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
Modified: GNUnet/src/include/gnunet_blockstore.h
===================================================================
--- GNUnet/src/include/gnunet_blockstore.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_blockstore.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -29,6 +29,13 @@
#include "gnunet_util.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* Data stored in the blockstore.
*/
@@ -139,4 +146,11 @@
} Blockstore;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Modified: GNUnet/src/include/gnunet_bootstrap_service.h
===================================================================
--- GNUnet/src/include/gnunet_bootstrap_service.h 2006-05-14 02:02:12 UTC
(rev 2799)
+++ GNUnet/src/include/gnunet_bootstrap_service.h 2006-05-14 02:03:51 UTC
(rev 2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -24,11 +24,18 @@
* @author Christian Grothoff
*/
-#ifndef HTTPhello_H
-#define HTTPhello_H
+#ifndef GNUNET_BOOTSTRAP_SERVICE_H
+#define GNUNET_BOOTSTRAP_SERVICE_H
#include "gnunet_core.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* Definition of a callback function that processes
* hello messages generated by the bootstrap API.
@@ -54,5 +61,13 @@
} Bootstrap_ServiceAPI;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+
/* end of gnunet_bootstrap_service.h */
#endif
Modified: GNUnet/src/include/gnunet_core.h
===================================================================
--- GNUnet/src/include/gnunet_core.h 2006-05-14 02:02:12 UTC (rev 2799)
+++ GNUnet/src/include/gnunet_core.h 2006-05-14 02:03:51 UTC (rev 2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -29,6 +29,13 @@
#include "gnunet_util.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* Just the version number of GNUnet-core API.
* Encoded as
@@ -40,7 +47,7 @@
* roughly the main GNUnet version scheme, but is
* more a compatibility ID.
*/
-#define GNUNET_CORE_VERSION 0x00070000
+#define GNUNET_CORE_VERSION 0x00070005
/**
@@ -715,4 +722,13 @@
typedef void (*UpdateMethod)(UpdateAPI * uapi);
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
#endif
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
Modified: GNUnet/src/include/gnunet_datastore_service.h
===================================================================
--- GNUnet/src/include/gnunet_datastore_service.h 2006-05-14 02:02:12 UTC
(rev 2799)
+++ GNUnet/src/include/gnunet_datastore_service.h 2006-05-14 02:03:51 UTC
(rev 2800)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -32,6 +33,13 @@
#include "gnunet_core.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* A value in the datastore.
*/
@@ -207,6 +215,12 @@
} Datastore_ServiceAPI;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
/* end of gnunet_datastore_service.h */
#endif
Modified: GNUnet/src/include/gnunet_dht.h
===================================================================
--- GNUnet/src/include/gnunet_dht.h 2006-05-14 02:02:12 UTC (rev 2799)
+++ GNUnet/src/include/gnunet_dht.h 2006-05-14 02:03:51 UTC (rev 2800)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -32,6 +33,14 @@
#include "gnunet_util.h"
#include "gnunet_blockstore.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+
/* ************* API specific errorcodes *********** */
#define DHT_ERRORCODES__TIMEOUT -2
@@ -174,4 +183,12 @@
} CS_dht_reply_ack_MESSAGE;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+
#endif /* GNUNET_DHT_H */
Modified: GNUnet/src/include/gnunet_dht_datastore_memory.h
===================================================================
--- GNUnet/src/include/gnunet_dht_datastore_memory.h 2006-05-14 02:02:12 UTC
(rev 2799)
+++ GNUnet/src/include/gnunet_dht_datastore_memory.h 2006-05-14 02:03:51 UTC
(rev 2800)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -24,11 +25,19 @@
* @author Simo Viitanen, Christian Grothoff
*/
-#ifndef DHT_DATASTORE_MEMORY_H
-#define DHT_DATASTORE_MEMORY_H
+#ifndef GNUNET_DHT_DATASTORE_MEMORY_H
+#define GNUNET_DHT_DATASTORE_MEMORY_H
#include "gnunet_blockstore.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+
/**
* Create a DHT Datastore (in memory)
* @param max_memory do not use more than max_memory memory.
@@ -42,4 +51,12 @@
*/
void destroy_blockstore_memory(Blockstore * ds);
+#if 0 /* keep Emacsens' auto-indent happy */
+{
#endif
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
Modified: GNUnet/src/include/gnunet_dht_lib.h
===================================================================
--- GNUnet/src/include/gnunet_dht_lib.h 2006-05-14 02:02:12 UTC (rev 2799)
+++ GNUnet/src/include/gnunet_dht_lib.h 2006-05-14 02:03:51 UTC (rev 2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -30,6 +30,14 @@
#include "gnunet_blockstore.h"
#include "gnunet_dht_service.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+
/**
* Initialize DHT_LIB. Call first.
*/
@@ -133,4 +141,12 @@
cron_t timeout,
const DataContainer * value);
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
#endif /* GNUNET_DHT_LIB_H */
Modified: GNUnet/src/include/gnunet_dht_service.h
===================================================================
--- GNUnet/src/include/gnunet_dht_service.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_dht_service.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -31,11 +31,18 @@
#ifndef GNUNET_DHT_SERVICE_H
#define GNUNET_DHT_SERVICE_H
-#include "gnunet_util.h"
#include "gnunet_core.h"
#include "gnunet_dht.h"
#include "gnunet_blockstore.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+
struct DHT_GET_RECORD;
struct DHT_PUT_RECORD;
@@ -164,4 +171,12 @@
} DHT_ServiceAPI;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+
#endif /* DHT_SERVICE_API_H */
Modified: GNUnet/src/include/gnunet_ecrs_lib.h
===================================================================
--- GNUnet/src/include/gnunet_ecrs_lib.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_ecrs_lib.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -30,6 +30,13 @@
#include "gnunet_util.h"
#include <extractor.h>
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* Just the version number of the AFS/ESED/ESED2/ECRS implementation.
* History:
@@ -44,7 +51,7 @@
* 4.0.x: with expiration, variable meta-data, kblocks
* 5.x.x: who knows? :-)
*/
-#define AFS_VERSION "4.0.1"
+#define AFS_VERSION "4.0.2"
#define GNUNET_DIRECTORY_MIME "application/gnunet-directory"
#define GNUNET_DIRECTORY_MAGIC "\211GND\r\n\032\n"
@@ -670,5 +677,11 @@
const ECRS_FileInfo * fis,
struct ECRS_MetaData * meta); /* directory.c */
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
#endif
Modified: GNUnet/src/include/gnunet_fragmentation_service.h
===================================================================
--- GNUnet/src/include/gnunet_fragmentation_service.h 2006-05-14 02:02:12 UTC
(rev 2799)
+++ GNUnet/src/include/gnunet_fragmentation_service.h 2006-05-14 02:03:51 UTC
(rev 2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -26,6 +26,15 @@
#ifndef GNUNET_FRAGMENTATION_SERVICE_H
#define GNUNET_FRAGMENTATION_SERVICE_H
+#include "gnunet_util.h"
+
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* @brief Definition of the fragmentation API.
*/
@@ -53,6 +62,12 @@
} Fragmentation_ServiceAPI;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
/* end of gnunet_fragmentation_service.h */
#endif
Modified: GNUnet/src/include/gnunet_fs_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fs_lib.h 2006-05-14 02:02:12 UTC (rev 2799)
+++ GNUnet/src/include/gnunet_fs_lib.h 2006-05-14 02:03:51 UTC (rev 2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -34,6 +34,14 @@
#include "gnunet_util.h"
#include "gnunet_datastore_service.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+
struct FS_SEARCH_CONTEXT;
struct FS_SEARCH_CONTEXT * FS_SEARCH_makeContext(Mutex * lock);
@@ -139,4 +147,12 @@
int FS_testIndexed(GNUNET_TCP_SOCKET * sock,
const HashCode512 * hc);
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Modified: GNUnet/src/include/gnunet_fsui_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fsui_lib.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_fsui_lib.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -61,9 +61,15 @@
#ifndef GNUNET_FSUI_LIB_H
#define GNUNET_FSUI_LIB_H
-#include "gnunet_util.h"
#include "gnunet_ecrs_lib.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* Entry representing an FSUI download. FSUI downloads form a tree
* (for properly representing recursive downloads) with an invisible
@@ -828,4 +834,12 @@
int FSUI_listURIs(ECRS_SearchProgressCallback iterator,
void * closure); /* file_info.c */
+#if 0 /* keep Emacsens' auto-indent happy */
+{
#endif
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
Modified: GNUnet/src/include/gnunet_gap_service.h
===================================================================
--- GNUnet/src/include/gnunet_gap_service.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_gap_service.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -30,10 +30,18 @@
#ifndef GAP_SERVICE_API_H
#define GAP_SERVICE_API_H
-#include "gnunet_util.h"
#include "gnunet_core.h"
#include "gnunet_blockstore.h"
+
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+
/**
* Function that helps the routing code to find out if
* a given reply is the one and only reply for a given
@@ -117,4 +125,13 @@
} GAP_ServiceAPI;
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+
#endif /* GAP_SERVICE_API_H */
Modified: GNUnet/src/include/gnunet_getoption_lib.h
===================================================================
--- GNUnet/src/include/gnunet_getoption_lib.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_getoption_lib.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -29,6 +29,14 @@
#include "gnunet_util.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+
/**
* Obtain option value from a peer.
* @return NULL on error
@@ -37,4 +45,11 @@
const char * section,
const char * option);
+#if 0 /* keep Emacsens' auto-indent happy */
+{
#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Modified: GNUnet/src/include/gnunet_identity_service.h
===================================================================
--- GNUnet/src/include/gnunet_identity_service.h 2006-05-14 02:02:12 UTC
(rev 2799)
+++ GNUnet/src/include/gnunet_identity_service.h 2006-05-14 02:03:51 UTC
(rev 2800)
@@ -32,6 +32,13 @@
#include "gnunet_core.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* How long may a hello be valid (in seconds). We use 10 days, do not
* change (would break compatibility with peers that have a different
@@ -204,5 +211,13 @@
} Identity_ServiceAPI;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+
/* end of gnunet_identity_service.h */
#endif
Modified: GNUnet/src/include/gnunet_kvstore_service.h
===================================================================
--- GNUnet/src/include/gnunet_kvstore_service.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_kvstore_service.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -25,11 +25,18 @@
* @author Nils Durner
*/
-#ifndef GNUNET_SQSTORE_SERVICE_H
-#define GNUNET_SQSTORE_SERVICE_H
+#ifndef GNUNET_KVSTORE_SERVICE_H
+#define GNUNET_KVSTORE_SERVICE_H
#include "gnunet_core.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* @brief Handle to a Key/Value-Table
*/
@@ -115,6 +122,12 @@
} KVstore_ServiceAPI;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
/* end of gnunet_kvstore_service.h */
#endif
Modified: GNUnet/src/include/gnunet_pingpong_service.h
===================================================================
--- GNUnet/src/include/gnunet_pingpong_service.h 2006-05-14 02:02:12 UTC
(rev 2799)
+++ GNUnet/src/include/gnunet_pingpong_service.h 2006-05-14 02:03:51 UTC
(rev 2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2001, 2002, 2004 Christian Grothoff (and other contributing authors)
+ (C) 2001, 2002, 2004, 2006 Christian Grothoff (and other contributing
authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -21,9 +21,15 @@
#ifndef GNUNET_PINGPONG_SERVICE_H
#define GNUNET_PINGPONG_SERVICE_H
-#include "gnunet_util.h"
#include "gnunet_core.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* @file include/gnunet_pingpong_service/pingpong.h
* @brief Pings a host and triggers an action if a reply is received.
@@ -70,4 +76,12 @@
} Pingpong_ServiceAPI;
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Modified: GNUnet/src/include/gnunet_protocols.h
===================================================================
--- GNUnet/src/include/gnunet_protocols.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_protocols.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other
contributing authors)
+ (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other
contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -34,6 +34,13 @@
#ifndef GNUNET_PROTOCOLS_H
#define GNUNET_PROTOCOLS_H
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/* ********* transport protocol numbers ************* */
/**
@@ -407,5 +414,10 @@
*/
#define ONDEMAND_BLOCK 0xFFFFFFFF
-
+#if 0 /* keep Emacsens' auto-indent happy */
+{
#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
Modified: GNUnet/src/include/gnunet_rpc_service.h
===================================================================
--- GNUnet/src/include/gnunet_rpc_service.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_rpc_service.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -26,10 +27,16 @@
#ifndef GNUNET_RPC_SERVICE_H
#define GNUNET_RPC_SERVICE_H
-#include "gnunet_util.h"
#include "gnunet_core.h"
#include "gnunet_blockstore.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* The function was called successfully and the return values
* are included in the message.
@@ -256,4 +263,11 @@
size_t RPC_paramSize(RPC_Param * param);
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
#endif /* GNUNET_RPC_SERVICE_H */
Modified: GNUnet/src/include/gnunet_session_service.h
===================================================================
--- GNUnet/src/include/gnunet_session_service.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_session_service.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other
contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -28,6 +29,13 @@
#include "gnunet_util.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* @brief session service API
*
@@ -47,6 +55,13 @@
} Session_ServiceAPI;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
/* end of gnunet_session_service.h */
Modified: GNUnet/src/include/gnunet_sqstore_service.h
===================================================================
--- GNUnet/src/include/gnunet_sqstore_service.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_sqstore_service.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -36,6 +36,14 @@
#include "gnunet_core.h"
#include "gnunet_datastore_service.h"
+
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* @brief Definition of the SQ-Store API.
*/
@@ -162,6 +170,12 @@
} SQstore_ServiceAPI;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
/* end of gnunet_sqstore_service.h */
#endif
Modified: GNUnet/src/include/gnunet_stats_lib.h
===================================================================
--- GNUnet/src/include/gnunet_stats_lib.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_stats_lib.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other
contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -28,6 +29,13 @@
#include "gnunet_util.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
#define STATS_VERSION "3.0.0"
/**
@@ -78,4 +86,11 @@
ProtocolProcessor processor,
void * cls);
+#if 0 /* keep Emacsens' auto-indent happy */
+{
#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Modified: GNUnet/src/include/gnunet_stats_service.h
===================================================================
--- GNUnet/src/include/gnunet_stats_service.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_stats_service.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other
contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -23,9 +24,17 @@
* @author Christian Grothoff
*/
-#ifndef STATS_SERVICE_API_H
-#define STATS_SERVICE_API_H
+#ifndef GNUNET_STATS_SERVICE_API_H
+#define GNUNET_STATS_SERVICE_API_H
+
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* @brief API to the stats service
*/
@@ -68,4 +77,11 @@
} Stats_ServiceAPI;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
#endif /* STATS_SERVICE_API_H */
Modified: GNUnet/src/include/gnunet_topology_service.h
===================================================================
--- GNUnet/src/include/gnunet_topology_service.h 2006-05-14 02:02:12 UTC
(rev 2799)
+++ GNUnet/src/include/gnunet_topology_service.h 2006-05-14 02:03:51 UTC
(rev 2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -29,6 +29,13 @@
#include "gnunet_util.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* @brief topology service API
*
@@ -74,6 +81,13 @@
} Topology_ServiceAPI;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
/* end of gnunet_topology_service.h */
Modified: GNUnet/src/include/gnunet_traffic_lib.h
===================================================================
--- GNUnet/src/include/gnunet_traffic_lib.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_traffic_lib.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -30,6 +30,13 @@
#include "gnunet_util.h"
#include "gnunet_traffic_service.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* Poll gnunetd via TCP about traffic information.
*
@@ -54,4 +61,12 @@
unsigned int * peers,
unsigned int * time);
+#if 0 /* keep Emacsens' auto-indent happy */
+{
#endif
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
Modified: GNUnet/src/include/gnunet_traffic_service.h
===================================================================
--- GNUnet/src/include/gnunet_traffic_service.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_traffic_service.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2001, 2002, 2003, 2004 Christian Grothoff (and other contributing
authors)
+ (C) 2001, 2002, 2003, 2004, 2006 Christian Grothoff (and other
contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -29,6 +29,13 @@
#include "gnunet_core.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* This type is for messages that we send.
*/
@@ -88,6 +95,13 @@
} Traffic_ServiceAPI;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
#endif
/* end of gnunet_traffic_service.h */
Modified: GNUnet/src/include/gnunet_transport.h
===================================================================
--- GNUnet/src/include/gnunet_transport.h 2006-05-14 02:02:12 UTC (rev
2799)
+++ GNUnet/src/include/gnunet_transport.h 2006-05-14 02:03:51 UTC (rev
2800)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -29,6 +29,12 @@
#include "gnunet_core.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
/**
* Just the version number of GNUnet-transport implementation.
@@ -347,6 +353,12 @@
*/
typedef TransportAPI * (*TransportMainMethod)(CoreAPIForTransport *);
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
/* end of gnunet_transport.h */
#endif
Modified: GNUnet/src/include/gnunet_transport_service.h
===================================================================
--- GNUnet/src/include/gnunet_transport_service.h 2006-05-14 02:02:12 UTC
(rev 2799)
+++ GNUnet/src/include/gnunet_transport_service.h 2006-05-14 02:03:51 UTC
(rev 2800)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other
contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -26,9 +27,15 @@
#ifndef GNUNET_TRANSPORT_SERVICE_H
#define GNUNET_TRANSPORT_SERVICE_H
-#include "platform.h"
#include "gnunet_transport.h"
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/**
* Type of the per-transport callback method.
*/
@@ -189,5 +196,12 @@
} Transport_ServiceAPI;
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
/* end of gnunet_transport_service.h */
#endif
Modified: GNUnet/src/include/gnunet_util.h
===================================================================
--- GNUnet/src/include/gnunet_util.h 2006-05-14 02:02:12 UTC (rev 2799)
+++ GNUnet/src/include/gnunet_util.h 2006-05-14 02:03:51 UTC (rev 2800)
@@ -47,7 +47,14 @@
unconditionally available... */
#include <stdlib.h>
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
/* **************** constants ****************** */
/* do not turn this on unless you know what you
@@ -2631,6 +2638,14 @@
*/
int termProcess(int pid);
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+
/* ifndef GNUNET_UTIL_H */
#endif
/* end of gnunet_util.h */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r2800 - in GNUnet: . contrib doc src/include,
grothoff <=