Upstream version 3.0preM

configure.ac

@@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may
 dnl contain other characters or be empty
 m4_define(FLDIGI_MAJOR, [3])
 m4_define(FLDIGI_MINOR, [0])
-m4_define(FLDIGI_PATCH, [preL])
+m4_define(FLDIGI_PATCH, [preM])
 
 AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])
 

src/misc/pskmail.cxx

@@ -29,6 +29,7 @@
 #define _END  27
 
 #ifdef __CYGWIN__
+	string str_dirname = "c:/NBEMS/";
 	string str_infile = "c:/NBEMS/ARQXFR/txfile";
 	string str_outfile = "c:/NBEMS/ARQXFR/rxfile";
 #endif
@@ -256,6 +257,7 @@ void check_formail() {
 
 #ifdef __CYGWIN__
 string holdbuffer;
+bool	havedir = false;
 
 void trywrite(void *)
 {
@@ -275,6 +277,15 @@ void trywrite(void *)
 void writeToARQfile(unsigned int data)
 {
 	FILE *outfile;
+	if (!havedir) {
+		DIR *dir = opendir(str_dirname.c_str());
+		if (dir == 0)
+			return;
+		else {
+			closedir(dir);
+			havedir = true;
+		}
+			
 	outfile = fopen(str_outfile.c_str(), "ab");
 	if (outfile) {
 		if (!holdbuffer.empty()) {

src/soundcard/sound.cxx

@@ -1471,7 +1471,7 @@ void SoundPort::init_hostapi_ext(void)
 		return;
 
 	PaError (*set_jack_client_name)(const char*);
-	char* err = dlerror();
+	const char* err = dlerror();
 	set_jack_client_name = (PaError (*)(const char*))dlsym(handle, "PaJack_SetClientName");
 	if (!(err = dlerror()))
 		set_jack_client_name(PACKAGE_TARNAME);