delete some unused code

Author: AllinCottrell

gui/console.c

@@ -233,19 +233,22 @@ static gint console_paste_handler (GtkWidget *w, gpointer p)
     return console_paste_text(w, GDK_NONE);
 }
 
-/* paste from X selection onto the command line */
+#if defined(__linux) || defined(linux)
 
 static gint console_click_handler (GtkWidget *w,
                                    GdkEventButton *event,
                                    gpointer p)
 {
+    /* paste from the X selection onto the command line */
     if (event->button == 2) {
         return console_paste_text(w, GDK_SELECTION_PRIMARY);
+    } else {
+        return FALSE;
     }
-
-    return FALSE;
 }
 
+#endif /* linux */
+
 enum {
     SAMPLE_RECORD,
     SAMPLE_CHECK

gui/gretlwin32.c

@@ -345,9 +345,9 @@ void gretl_win32_debug_init (int debug)
 
 void gretl_win32_init (int debug, int ignore_rc)
 {
+#if GTK_MAJOR_VERSION < 3
     char tmp[4] = {0};
 
-#if GTK_MAJOR_VERSION < 3
     read_reg_val(HKEY_CURRENT_USER,
 		 "Microsoft\\Windows\\CurrentVersion\\ThemeManager",
 		 "ThemeActive", tmp);
@@ -466,7 +466,6 @@ int emf_to_clipboard (char *emfname)
     HENHMETAFILE hemfclip;
     HENHMETAFILE hemf = NULL;
     HANDLE htest;
-    gchar *fconv = NULL;
 
 #if GTK_MAJOR_VERSION > 2
     mainw = GDK_WINDOW_HWND(gtk_widget_get_window(mdata->main));

lib/src/gretl_foreign.c

@@ -242,6 +242,8 @@ static int set_foreign_lang (const char *lang, PRN *prn)
     return err;
 }
 
+#ifndef G_OS_WIN32
+
 static int lib_run_prog_sync (char **argv, gretlopt opt,
                               int lang, PRN *prn)
 {
@@ -306,6 +308,8 @@ static int lib_run_prog_sync (char **argv, gretlopt opt,
     return err;
 }
 
+#endif /* not Windows */
+
 #ifdef HAVE_MPI /* start common MPI-driver code block */
 
 enum {
@@ -901,7 +905,7 @@ static int win32_lib_run_other_sync (gretlopt opt, PRN *prn)
 
 #else /* non-Windows code follows */
 
-#ifdef __APPLE__
+# ifdef __APPLE__
 
 static int lib_run_R_sync (gretlopt opt, PRN *prn)
 {
@@ -928,7 +932,7 @@ static int lib_run_R_sync (gretlopt opt, PRN *prn)
     return ret;
 }
 
-#else
+# else
 
 static int lib_run_R_sync (gretlopt opt, PRN *prn)
 {
@@ -944,7 +948,7 @@ static int lib_run_R_sync (gretlopt opt, PRN *prn)
     return lib_run_prog_sync(argv, opt, LANG_R, prn);
 }
 
-#endif /* macOS or not */
+# endif /* macOS or not */
 
 static int lib_run_other_sync (gretlopt opt, PRN *prn)
 {

lib/src/gretl_paths.c

@@ -2279,17 +2279,6 @@ void show_paths (void)
 
 #ifdef WIN32
 
-static char *rightmost (char *s1, char *s2)
-{
-    if (s1 == NULL) {
-        return s2;
-    } else if (s2 == NULL) {
-        return s1;
-    } else {
-        return (s2 - s1 > 0)? s2 : s1;
-    }
-}
-
 static char getsep (const char *s)
 {
     int bak = 0, fwd = 0;

lib/src/gretl_win32.c

@@ -416,7 +416,6 @@ int win32_ensure_dll_path (void)
 {
     const char *bindir = gretl_bindir();
     const gchar *path = g_getenv("PATH");
-    const gchar *tmpd = g_getenv("TMPDIR");
     int in_path = 0;
 
     if (path != NULL) {