diff options
| author | Thomas White <taw@physics.org> | 2021-07-23 17:10:11 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2022-06-02 12:15:38 +0200 |
| commit | 8735bc06caf9ab07b13108f80763a6ff164f0db6 (patch) | |
| tree | a65567048dae0e44a571ce50cbd471377b2c5693 /src/im-asapo.h | |
| parent | c1a526cebf6e97d78ff340148952421feaaee9c3 (diff) | |
ASAP::O: Tidy up build process
This removes a lot of random #ifdefs from the source code.
Diffstat (limited to 'src/im-asapo.h')
| -rw-r--r-- | src/im-asapo.h | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/src/im-asapo.h b/src/im-asapo.h index 3ffc5808..b0c413f5 100644 --- a/src/im-asapo.h +++ b/src/im-asapo.h @@ -36,34 +36,28 @@ #if defined(HAVE_ASAPO) -#include <asapo/consumer_c.h> - extern struct im_asapo *im_asapo_connect(const char *endpoint, const char *token, const char *beamtime, const char *path, - AsapoStringHandle group_id); + const char *group_id); extern void im_asapo_shutdown(struct im_asapo *a); extern void *im_asapo_fetch(struct im_asapo *a, size_t *pdata_size); -extern AsapoStringHandle im_asapo_group_id_from_string(const char *str); - -extern AsapoStringHandle im_asapo_make_unique_group_id(const char *endpoint, - const char *token, - const char *beamtime, - const char *path); +extern char *im_asapo_make_unique_group_id(const char *endpoint, + const char *token, + const char *beamtime, + const char *path); #else /* defined(HAVE_ASAPO) */ -typedef void* AsapoStringHandle; - static UNUSED struct im_asapo *im_asapo_connect(const char *endpoint, const char *token, const char *beamtime, const char *path, - AsapoStringHandle group_id) + const char *group_id) { return NULL; } @@ -78,16 +72,10 @@ static UNUSED void *im_asapo_fetch(struct im_asapo *a, size_t *psize) return NULL; } -static UNUSED AsapoStringHandle im_asapo_group_id_from_string(const char *str) -{ - return NULL; -} - -static UNUSED AsapoStringHandle im_asapo_make_unique_group_id(const char *endpoint, - const char *token, - const char *beamtime, - const char *path - AsapoStringHandle group_id) +static char *im_asapo_make_unique_group_id(const char *endpoint, + const char *token, + const char *beamtime, + const char *path) { return NULL; } |