X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=07cfa2facfb9eefce062c243ad4f6d7ead0a417b;hp=5257b791b9e9e15c93b2b93365d29f5a6cec1f7e;hb=9b12bf0ee0749214cef473ee96f5b94de8eb7a47;hpb=aaabd61b1297bae5b719c4d61da4c6fd1a26c111 diff --git a/main.cpp b/main.cpp index 5257b791..07cfa2fa 100644 --- a/main.cpp +++ b/main.cpp @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifdef ENABLE_SIGROKDECODE #include /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#endif #include #include @@ -84,10 +82,7 @@ int main(int argc, char *argv[]) { const int loglevel = atoi(optarg); sr_log_loglevel_set(loglevel); - -#ifdef ENABLE_SIGROKDECODE srd_log_loglevel_set(loglevel); -#endif break; } @@ -118,7 +113,6 @@ int main(int argc, char *argv[]) do { -#ifdef ENABLE_SIGROKDECODE // Initialise libsigrokdecode if (srd_init(NULL) != SRD_OK) { qDebug() << "ERROR: libsigrokdecode init failed."; @@ -127,7 +121,6 @@ int main(int argc, char *argv[]) // Load the protocol decoders srd_decoder_load_all(); -#endif try { // Create the device manager, initialise the drivers @@ -160,10 +153,8 @@ int main(int argc, char *argv[]) qDebug() << e.what(); } -#ifdef ENABLE_SIGROKDECODE // Destroy libsigrokdecode srd_exit(); -#endif } while (0);