Push ENABLE_NLS above include of "graphics-info.h"

Fixes Charles cgettext() header problems.
pemsley · Jan 26, 2022 · 18202fe · 18202fe
1 parent 6968b19
commit 18202fe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/lbg-interface.cc b/src/lbg-interface.cc
@@ -23,13 +23,11 @@
 #endif
 
 #include "compat/coot-sysdep.h"
+#define ENABLE_NLS // 20220126-PE Charles says this is needed to fix dcgettext() problems
+                   // when including libintl.h - move it up above graphics-info.h
 #include "graphics-info.h"
 
-
 #include <cstring>
-#define ENABLE_NLS // fix dcgettext() header problems on including
-		   // libintl.h (via RDKitBase.h etc (including boost
-		   // stuff).
 
 #ifdef MAKE_ENHANCED_LIGAND_TOOLS
 #include "lidia-core/rdkit-interface.hh"

diff --git a/src/restraints-editor.cc b/src/restraints-editor.cc
@@ -226,8 +226,8 @@ coot::restraints_editor::get_column_type(int tree_type, int column_number, int m
 	 break;
       default:
 	 r = G_TYPE_STRING;
-      } 
-   } 
+      }
+   }
    if (tree_type == coot::restraints_editor::TREE_TYPE_CHIRALS) {
       switch(column_number) {
       case(5):

diff --git a/src/sdf-interface.cc b/src/sdf-interface.cc
@@ -25,6 +25,8 @@
 
 // We need this high so that dcgettext() so we don't get expected unqualified-id before 'const'
 // errors when we read libintl from rdkit-interface.hh
+#define ENABLE_NLS // 20220126-PE Charles says this is needed to fix dcgettext() problems
+                   // when including libintl.h - hmm!
 #include "graphics-info.h"
 #ifdef MAKE_ENHANCED_LIGAND_TOOLS
 #include <libintl.h>
@@ -34,10 +36,6 @@
 
 #include <cstring>
 
-#define ENABLE_NLS // fix dcgettext() header problems on including
-		   // libintl.h (via RDKitBase.h etc (including boost
-		   // stuff).
-
 #include <iostream> // for istream?
 #include <istream> // for istream?