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

further win32 porting 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@552 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.1.2
Stéphane Fillod, F8CFE 2001-06-15 06:59:47 +00:00
rodzic 1a2d7efe08
commit 5db86a5914
2 zmienionych plików z 18 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -5,7 +5,7 @@
* will be used for obtaining rig capabilities. * will be used for obtaining rig capabilities.
* *
* *
* $Id: rig.h,v 1.39 2001-06-12 23:59:21 f4cfe Exp $ * $Id: rig.h,v 1.40 2001-06-15 06:59:47 f4cfe Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -31,6 +31,9 @@
#include <stdio.h> /* required for FILE definition */ #include <stdio.h> /* required for FILE definition */
#include <sys/time.h> /* required for struct timeval */ #include <sys/time.h> /* required for struct timeval */
#if defined(__CYGWIN__) || defined(_WIN32)
#include <windows.h> /* HANDLE definition */
#endif
/* __BEGIN_DECLS should be used at the beginning of your declarations, /* __BEGIN_DECLS should be used at the beginning of your declarations,
* so that C++ compilers don't mangle their names. Use __END_DECLS at * so that C++ compilers don't mangle their names. Use __END_DECLS at
@ -846,7 +849,7 @@ typedef struct {
} type; } type;
int fd; int fd;
FILE *stream; FILE *stream;
#ifdef _WIN32 #if defined(__CYGWIN__) || defined(_WIN32)
HANDLE handle; /* for serial special handling (PTT,DCD,..) */ HANDLE handle; /* for serial special handling (PTT,DCD,..) */
#endif #endif
@ -959,6 +962,11 @@ struct rig_state {
*/ */
rig_ptr_t priv; rig_ptr_t priv;
/*
* internal use by hamlib++ for event handling
*/
rig_ptr_t obj;
/* etc... */ /* etc... */
}; };

13
include/hamlib/rig_dll.h
Wyświetl plik

@ -1,4 +1,4 @@
/* $Id: rig_dll.h,v 1.1 2001-06-12 23:59:21 f4cfe Exp $ */ /* $Id: rig_dll.h,v 1.2 2001-06-15 06:59:47 f4cfe Exp $ */
#if defined(__CYGWIN__) #if defined(__CYGWIN__)
@ -6,6 +6,9 @@
# if defined(HAMLIB_STATIC) # if defined(HAMLIB_STATIC)
# undef HAMLIB_STATIC # undef HAMLIB_STATIC
# endif # endif
# if defined(ALL_STATIC)
# undef ALL_STATIC
# endif
# endif # endif
# undef HAMLIB_IMPEXP # undef HAMLIB_IMPEXP
# undef HAMLIB_API # undef HAMLIB_API
@ -14,9 +17,9 @@
# if defined(HAMLIB_DLL) # if defined(HAMLIB_DLL)
/* building a DLL */ /* building a DLL */
# define HAMLIB_IMPEXP __declspec(dllexport) # define HAMLIB_IMPEXP __declspec(dllexport)
# elif defined(HAMLIB_STATIC) # elif defined(HAMLIB_STATIC) || defined(ALL_STATIC)
/* building or linking to a static library */ /* building or linking to a static library */
# define HAMLIB_IMPEXP /* nothing */ # define HAMLIB_IMPEXP
# else # else
/* linking to the DLL */ /* linking to the DLL */
# define HAMLIB_IMPEXP __declspec(dllimport) # define HAMLIB_IMPEXP __declspec(dllimport)
@ -28,10 +31,10 @@
/* Take care of non-cygwin platforms */ /* Take care of non-cygwin platforms */
#if !defined(HAMLIB_IMPEXP) #if !defined(HAMLIB_IMPEXP)
# define HAMLIB_IMPEXP /* nothing */ # define HAMLIB_IMPEXP
#endif #endif
#if !defined(HAMLIB_API) #if !defined(HAMLIB_API)
# define HAMLIB_API /* nothing */ # define HAMLIB_API
#endif #endif
#if !defined(HAMLIB_EXPORT) #if !defined(HAMLIB_EXPORT)
# define HAMLIB_EXPORT(type) HAMLIB_IMPEXP type HAMLIB_API # define HAMLIB_EXPORT(type) HAMLIB_IMPEXP type HAMLIB_API