mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

prepare type rename of port_t to hamlib_port_t, to solve a name clash under MacOSX C++ 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1950 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.4
Stéphane Fillod, F8CFE 2005-03-26 23:33:39 +00:00
rodzic c806c7e40c
commit ded48a9d88
2 zmienionych plików z 17 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
include/hamlib/rig.h
Wyświetl plik

@ -1,8 +1,8 @@
/*
* Hamlib Interface - API header
* Copyright (c) 2000-2004 by Stephane Fillod and Frank Singleton
* Copyright (c) 2000-2005 by Stephane Fillod and Frank Singleton
*
* $Id: rig.h,v 1.101 2005-01-24 23:03:22 fillods Exp $
* $Id: rig.h,v 1.102 2005-03-26 23:33:39 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -1248,7 +1248,11 @@ typedef struct {
int pin; /*!< Parrallel port pin number */
} parallel; /*!< parallel attributes */
} parm; /*!< Port parameter union */
} port_t;
} hamlib_port_t;
#if !defined(__MACOSX__) || !defined(__cplusplus)
typedef hamlib_port_t port_t;
#endif
/**
@ -1264,9 +1268,9 @@ struct rig_state {
/*
* overridable fields
*/
port_t rigport; /*!< Rig port (internal use). */
port_t pttport; /*!< PTT port (internal use). */
port_t dcdport; /*!< DCD port (internal use). */
hamlib_port_t rigport; /*!< Rig port (internal use). */
hamlib_port_t pttport; /*!< PTT port (internal use). */
hamlib_port_t dcdport; /*!< DCD port (internal use). */
double vfo_comp; /*!< VFO compensation in PPM, 0.0 to disable */
@ -1545,9 +1549,9 @@ extern HAMLIB_EXPORT(int) rig_load_backend HAMLIB_PARAMS((const char *be_name));
extern HAMLIB_EXPORT(int) rig_check_backend HAMLIB_PARAMS((rig_model_t rig_model));
extern HAMLIB_EXPORT(int) rig_load_all_backends HAMLIB_PARAMS(());
typedef int (*rig_probe_func_t)(const port_t *, rig_model_t, rig_ptr_t);
extern HAMLIB_EXPORT(int) rig_probe_all HAMLIB_PARAMS((port_t *p, rig_probe_func_t, rig_ptr_t));
extern HAMLIB_EXPORT(rig_model_t) rig_probe HAMLIB_PARAMS((port_t *p));
typedef int (*rig_probe_func_t)(const hamlib_port_t *, rig_model_t, rig_ptr_t);
extern HAMLIB_EXPORT(int) rig_probe_all HAMLIB_PARAMS((hamlib_port_t *p, rig_probe_func_t, rig_ptr_t));
extern HAMLIB_EXPORT(rig_model_t) rig_probe HAMLIB_PARAMS((hamlib_port_t *p));
/* Misc calls */

8
include/hamlib/rotator.h
Wyświetl plik

@ -1,8 +1,8 @@
/*
* Hamlib Interface - Rotator API header
* Copyright (c) 2000-2003 by Stephane Fillod
* Copyright (c) 2000-2005 by Stephane Fillod
*
* $Id: rotator.h,v 1.11 2003-11-03 04:26:37 n0nb Exp $
* $Id: rotator.h,v 1.12 2005-03-26 23:33:39 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -267,7 +267,7 @@ struct rot_state {
/*
* non overridable fields, internal use
*/
port_t rotport; /*!< Rotator port (internal use). */
hamlib_port_t rotport; /*!< Rotator port (internal use). */
int comm_state; /*!< Comm port state, opened/closed. */
rig_ptr_t priv; /*!< Pointer to private rotator state data. */
@ -320,7 +320,7 @@ extern HAMLIB_EXPORT(int) rot_list_foreach HAMLIB_PARAMS((int (*cfunc)(const str
extern HAMLIB_EXPORT(int) rot_load_backend HAMLIB_PARAMS((const char *be_name));
extern HAMLIB_EXPORT(int) rot_check_backend HAMLIB_PARAMS((rot_model_t rot_model));
extern HAMLIB_EXPORT(int) rot_load_all_backends HAMLIB_PARAMS(());
extern HAMLIB_EXPORT(rot_model_t) rot_probe_all HAMLIB_PARAMS((port_t *p));
extern HAMLIB_EXPORT(rot_model_t) rot_probe_all HAMLIB_PARAMS((hamlib_port_t *p));
extern HAMLIB_EXPORT(int) rot_token_foreach HAMLIB_PARAMS((ROT *rot, int (*cfunc)(const struct confparams *, rig_ptr_t), rig_ptr_t data));
extern HAMLIB_EXPORT(const struct confparams*) rot_confparam_lookup HAMLIB_PARAMS((ROT *rot, const char *name));