← Back to branch summary

~ubuntu-branches/ubuntu/trusty/glib2.0/trusty-proposed

« back to all changes in this revision

Viewing changes to glibconfig.h.win32.in

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-03-09 11:28:22 UTC
  • mfrom: (3.4.8 experimental)
  • Revision ID: james.westby@ubuntu.com-20100309112822-j4n0v3xbtsup8s97
Tags: 2.23.5-1ubuntu1
* Resync on Debian
* debian/patches/01_gettext-desktopfiles.patch:
  - updated to use gettext for X-GNOME-Fullname too
* debian/patches/71_gio_launch_handler.patch:
  - new gio default launch handle feature required for wncksync
* debian/control.in, 
  debian/patches/80-gtester-subunit.patch:
  - gtester-report subunit support
* debian/libglib2.0-0.symbols:
  - updated the symbols list for the gio launcher handler
* debian/rules:
  - don't break build on test suite errors, debian recently activated this but
    the build breaks even when there is no error in the testsuite

Show diffs side-by-side

added added

removed removed

Lines of Context:
glibconfig.h.win32.in
122
122
typedef signed int gintptr;
123
123
typedef unsigned int guintptr;
124
124
 
 
125
#define G_GINTPTR_MODIFIER      ""
 
126
#define G_GINTPTR_FORMAT        "i"
 
127
#define G_GUINTPTR_FORMAT       "u"
 
128
 
125
129
#else
126
130
 
127
131
#define GPOINTER_TO_INT(p)      ((gint)  (gint64) (p))
138
142
typedef unsigned __int64 guintptr;
139
143
#endif
140
144
 
 
145
#define G_GINTPTR_MODIFIER      "I64"
 
146
#define G_GINTPTR_FORMAT        "I64i"
 
147
#define G_GUINTPTR_FORMAT       "I64u"
 
148
 
141
149
#endif
142
150
 
143
151
#ifdef NeXT /* @#%@! NeXTStep */