/[svn]/gigedit/trunk/src/gigedit/global.h
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/global.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3340 by schoenebeck, Mon Jul 31 11:20:18 2017 UTC revision 3472 by persson, Sat Feb 16 19:56:56 2019 UTC
# Line 1  Line 1 
1  /*                                                         -*- c++ -*-  /*                                                         -*- c++ -*-
2   * Copyright (C) 2007-2017 Andreas Persson   * Copyright (C) 2007-2019 Andreas Persson
3   *   *
4   * This program is free software; you can redistribute it and/or   * This program is free software; you can redistribute it and/or
5   * modify it under the terms of the GNU General Public License as   * modify it under the terms of the GNU General Public License as
# Line 25  Line 25 
25  #endif  #endif
26    
27  #include <cstring>  #include <cstring>
28    #include <algorithm>
29    
30  #include <glibmmconfig.h>  #ifdef GLIBMM_HEADER_FILE
31  // threads.h must be included first to be able to build with  # include GLIBMM_HEADER_FILE(glibmmconfig.h)
32  // G_DISABLE_DEPRECATED  #else
33  #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION == 31 && GLIBMM_MICRO_VERSION >= 2) || \  # include <glibmmconfig.h>
     (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION > 31) || GLIBMM_MAJOR_VERSION > 2  
 #include <glibmm/threads.h>  
34  #endif  #endif
35    
36  #if !defined(WIN32)  #if !defined(WIN32)
# Line 41  Line 40 
40    
41  #include <sstream>  #include <sstream>
42  #include <map>  #include <map>
43    #include <sigc++/signal.h>
44    
45  #ifdef LIBGIG_HEADER_FILE  #ifdef LIBGIG_HEADER_FILE
46  # include LIBGIG_HEADER_FILE(gig.h)  # include LIBGIG_HEADER_FILE(gig.h)
# Line 51  Line 51 
51  #endif  #endif
52    
53  //FIXME: for some reason AC GETTEXT check fails on the Mac cross compiler?  //FIXME: for some reason AC GETTEXT check fails on the Mac cross compiler?
54  #if (HAVE_GETTEXT || defined(__APPLE__))  #ifdef GETTEXT_HEADER_FILE
55    # include GETTEXT_HEADER_FILE(libintl.h)
56    #elif (HAVE_GETTEXT || defined(__APPLE__))
57  # include <libintl.h>  # include <libintl.h>
58  # define _(String) gettext(String)  # define _(String) gettext(String)
59  #else  #else
Legend:
Removed from v.3340  
changed lines
  Added in v.3472
  ViewVC Help
Powered by ViewVC