Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions development/dll/include/gurux.serial.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ using namespace std;
#include <windows.h>
//Linux headers.
#else
#include <string.h> // string function definitions
#include <string> // string function definitions
#include <inttypes.h>
#include <unistd.h> // UNIX standard function definitions
#include <fcntl.h> // File control definitions
#include <errno.h> // Error number definitions
Expand Down Expand Up @@ -80,16 +81,16 @@ int GXSetCommState(HANDLE hWnd, LPDCB DCB);
static void ReportError(JNIEnv* env, DWORD err);

#else //LINUX

typedef uint32_t DWORD;
static basic_string<char> GetDriver(const basic_string<char>& tty);
static void GetComPort(const string& dir, vector<basic_string<char> >& ports);
void GetLinuxSerialPorts(JNIEnv* env, std::vector<std::basic_string<char> >& ports);

//static void ReportError(JNIEnv* env, DWORD err);
#endif

void ReportError(JNIEnv* env, const char* pError)
{
env->FatalError(pError);
env->FatalError(pError);
}

extern "C"
Expand Down
Loading