Mercurial > pidgin.yaz
comparison libpurple/internal.h @ 27994:c43c87965db9
merge of '2c429e7e623da14e68de42a031909190e1f9dbac'
and '481dcc62a70f66aaa407732e9195d711b6d6b17c'
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Wed, 22 Jul 2009 02:36:28 +0000 |
| parents | 91b8a957776a |
| children | 39716f7d2c93 15cde23b43bc 1e5654e2928d |
comparison
equal
deleted
inserted
replaced
| 27972:605b950f4644 | 27994:c43c87965db9 |
|---|---|
| 226 # if __GNUC__ >= 4 | 226 # if __GNUC__ >= 4 |
| 227 # define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) | 227 # define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) |
| 228 # else | 228 # else |
| 229 # define G_GNUC_NULL_TERMINATED | 229 # define G_GNUC_NULL_TERMINATED |
| 230 # endif | 230 # endif |
| 231 #endif | |
| 232 | |
| 233 #ifdef HAVE_CONFIG_H | |
| 234 #if SIZEOF_TIME_T == 4 | |
| 235 # define PURPLE_TIME_T_MODIFIER "lu" | |
| 236 #elif SIZEOF_TIME_T == 8 | |
| 237 # define PURPLE_TIME_T_MODIFIER "zu" | |
| 238 #else | |
| 239 #error Unknown size of time_t | |
| 240 #endif | |
| 231 #endif | 241 #endif |
| 232 | 242 |
| 233 #include <glib-object.h> | 243 #include <glib-object.h> |
| 234 | 244 |
| 235 #ifndef G_DEFINE_TYPE | 245 #ifndef G_DEFINE_TYPE |