remove gcommon.h and add misc/gcommon.[ch]
@@ -1,422 +0,0 @@ | ||
1 | -/* | |
2 | - gcommon | |
3 | - copyright (c) 1998-2009 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
4 | - | |
5 | - This program is free software: you can redistribute it and/or modify | |
6 | - it under the terms of the GNU General Public License as published by | |
7 | - the Free Software Foundation, either version 3 of the License, or | |
8 | - (at your option) any later version. | |
9 | - | |
10 | - This program is distributed in the hope that it will be useful, | |
11 | - but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
13 | - GNU General Public License for more details. | |
14 | - | |
15 | - You should have received a copy of the GNU General Public License | |
16 | - along with this program. If not, see <http://www.gnu.org/licenses/>. | |
17 | -*/ | |
18 | -#ifndef __GCOMMON_H__ | |
19 | -#define __GCOMMON_H__ | |
20 | - | |
21 | - | |
22 | -#ifdef HAVE_CONFIG_H | |
23 | -# include "config.h" | |
24 | -#endif /* HAVE_CONFIG_H */ | |
25 | - | |
26 | - | |
27 | -#include <stdio.h> | |
28 | -#if STDC_HEADERS | |
29 | -# include <stdlib.h> | |
30 | -# include <string.h> | |
31 | -#elif HAVE_STRINGS_H | |
32 | -# include <strings.h> | |
33 | -#endif /* HAVE_STRINGS_H */ | |
34 | -#include <gtk/gtk.h> | |
35 | - | |
36 | - | |
37 | -#ifndef SPACING | |
38 | -# define SPACING 5 | |
39 | -#endif /* not SPACING */ | |
40 | - | |
41 | - | |
42 | -#if defined (USE_THREAD) && ! defined (G_THREADS_ENABLED) | |
43 | -# undef USE_THREAD | |
44 | -#endif /* defined (USE_THREAD) && ! defined (G_THREADS_ENABLED) */ | |
45 | - | |
46 | - | |
47 | -#if ! GLIB_CHECK_VERSION(2,14,0) | |
48 | -typedef gint64 goffset; | |
49 | -#endif /* not GLIB_CHECK_VERSION(2,14,0) */ | |
50 | -typedef gint64 glonglong; | |
51 | -typedef guint64 gulonglong; | |
52 | -#if ! GLIB_CHECK_VERSION(2,18,0) | |
53 | -typedef glong gintptr; | |
54 | -typedef gulong guintptr; | |
55 | -#endif /* not GLIB_CHECK_VERSION(2,18,0) */ | |
56 | - | |
57 | - | |
58 | -#ifndef G_GUINT64_CONSTANT | |
59 | -# ifdef _MSC_VER | |
60 | -# define G_GUINT64_CONSTANT(val) (val##Ui64) | |
61 | -# else /* not _MSC_VER */ | |
62 | -# define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION(val##ULL)) | |
63 | -# endif /* not _MSC_VER */ | |
64 | -#endif /* not G_GUINT64_CONSTANT */ | |
65 | -#ifndef G_GOFFSET_CONSTANT | |
66 | -# define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val) | |
67 | -#endif /* not G_GOFFSET_CONSTANT */ | |
68 | - | |
69 | - | |
70 | -#ifndef G_MININT8 | |
71 | -# define G_MININT8 ((gint8)0x80) | |
72 | -#endif /* not G_MININT8 */ | |
73 | -#ifndef G_MAXINT8 | |
74 | -# define G_MAXINT8 ((gint8)0x7f) | |
75 | -#endif /* not G_MAXINT8 */ | |
76 | -#ifndef G_MAXUINT8 | |
77 | -# define G_MAXUINT8 ((guint8)0xff) | |
78 | -#endif /* not G_MAXUINT8 */ | |
79 | -#ifndef G_MININT16 | |
80 | -# define G_MININT16 ((gint16)0x8000) | |
81 | -#endif /* not G_MININT16 */ | |
82 | -#ifndef G_MAXINT16 | |
83 | -# define G_MAXINT16 ((gint16)0x7fff) | |
84 | -#endif /* not G_MAXINT16 */ | |
85 | -#ifndef G_MAXUINT16 | |
86 | -# define G_MAXUINT16 ((guint16)0xffff) | |
87 | -#endif /* not G_MAXUINT16 */ | |
88 | -#ifndef G_MININT32 | |
89 | -# define G_MININT32 ((gint32)0x80000000) | |
90 | -#endif /* not G_MININT32 */ | |
91 | -#ifndef G_MAXINT32 | |
92 | -# define G_MAXINT32 ((gint32)0x7fffffff) | |
93 | -#endif /* not G_MAXINT32 */ | |
94 | -#ifndef G_MAXUINT32 | |
95 | -# define G_MAXUINT32 ((guint32)0xffffffff) | |
96 | -#endif /* not G_MAXUINT32 */ | |
97 | -#ifndef G_MAXSIZE | |
98 | -# define G_MAXSIZE G_MAXUINT | |
99 | -#endif /* not G_MAXSIZE */ | |
100 | -#ifndef G_MINSSIZE | |
101 | -# define G_MINSSIZE G_MININT | |
102 | -#endif /* not G_MINSSIZE */ | |
103 | -#ifndef G_MAXSSIZE | |
104 | -# define G_MAXSSIZE G_MAXINT | |
105 | -#endif /* not G_MAXSSIZE */ | |
106 | -#ifndef G_MINOFFSET | |
107 | -# define G_MINOFFSET G_MININT64 | |
108 | -#endif /* not G_MINOFFSET */ | |
109 | -#ifndef G_MAXOFFSET | |
110 | -# define G_MAXOFFSET G_MAXINT64 | |
111 | -#endif /* not G_MAXOFFSET */ | |
112 | - | |
113 | - | |
114 | -#ifndef G_IS_DIR_SEPARATOR | |
115 | -# ifdef G_OS_WIN32 | |
116 | -# define G_IS_DIR_SEPARATOR(c) ((c)==G_DIR_SEPARATOR||(c)=='/') | |
117 | -# else /* not G_OS_WIN32 */ | |
118 | -# define G_IS_DIR_SEPARATOR(c) ((c)==G_DIR_SEPARATOR) | |
119 | -# endif /* not G_OS_WIN32 */ | |
120 | -#endif /* not G_IS_DIR_SEPARATOR */ | |
121 | - | |
122 | - | |
123 | -#ifndef G_PASTE | |
124 | -# define G_PASTE(identifier1,identifier2) G_PASTE_ARGS(identifier1,identifier2) | |
125 | -#endif /* not G_PASTE */ | |
126 | -#ifndef G_PASTE_ARGS | |
127 | -# define G_PASTE_ARGS(identifier1,identifier2) identifier1##identifier2 | |
128 | -#endif /* not G_PASTE_ARGS */ | |
129 | -#ifndef G_STATIC_ASSERT | |
130 | -# define G_STATIC_ASSERT(expr) typedef struct { char Compile_Time_Assertion[(expr) ? 1 : -1]; } G_PASTE (_GStaticAssert_, __LINE__) | |
131 | -#endif /* not G_STATIC_ASSERT */ | |
132 | - | |
133 | - | |
134 | -#ifndef G_GNUC_MALLOC | |
135 | -# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
136 | -# define G_GNUC_MALLOC __attribute__((__malloc__)) | |
137 | -# else | |
138 | -# define G_GNUC_MALLOC | |
139 | -# endif | |
140 | -#endif /* not G_GNUC_MALLOC */ | |
141 | -#ifndef G_GNUC_ALLOC_SIZE | |
142 | -# if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) | |
143 | -# define G_GNUC_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) | |
144 | -# else | |
145 | -# define G_GNUC_ALLOC_SIZE(x) | |
146 | -# endif | |
147 | -#endif /* not G_GNUC_ALLOC_SIZE */ | |
148 | -#ifndef G_GNUC_ALLOC_SIZE2 | |
149 | -# if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) | |
150 | -# define G_GNUC_ALLOC_SIZE2(x,y) __attribute__((__alloc_size__(x,y))) | |
151 | -# else | |
152 | -# define G_GNUC_ALLOC_SIZE2(x,y) | |
153 | -# endif | |
154 | -#endif /* not G_GNUC_ALLOC_SIZE2 */ | |
155 | -#ifndef G_GNUC_DEPRECATED | |
156 | -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) | |
157 | -# define G_GNUC_DEPRECATED __attribute__((__deprecated__)) | |
158 | -# else | |
159 | -# define G_GNUC_DEPRECATED | |
160 | -# endif | |
161 | -#endif /* not G_GNUC_DEPRECATED */ | |
162 | -#ifndef G_GNUC_NULL_TERMINATED | |
163 | -# if __GNUC__ >= 4 | |
164 | -# define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) | |
165 | -# else | |
166 | -# define G_GNUC_NULL_TERMINATED | |
167 | -# endif | |
168 | -#endif /* not G_GNUC_NULL_TERMINATED */ | |
169 | -#ifndef G_GNUC_WARN_UNUSED_RESULT | |
170 | -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) | |
171 | -# define G_GNUC_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) | |
172 | -# else | |
173 | -# define G_GNUC_WARN_UNUSED_RESULT | |
174 | -# endif | |
175 | -#endif /* not G_GNUC_WARN_UNUSED_RESULT */ | |
176 | -#ifndef G_GNUC_INTERNAL | |
177 | -# if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) | |
178 | -# define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) | |
179 | -# elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) | |
180 | -# define G_GNUC_INTERNAL __hidden | |
181 | -# elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY) | |
182 | -# define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) | |
183 | -# else | |
184 | -# define G_GNUC_INTERNAL | |
185 | -# endif | |
186 | -#endif /* not G_GNUC_INTERNAL */ | |
187 | -#ifndef G_GNUC_MAY_ALIAS | |
188 | -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) | |
189 | -# define G_GNUC_MAY_ALIAS __attribute__((may_alias)) | |
190 | -# else | |
191 | -# define G_GNUC_MAY_ALIAS | |
192 | -# endif | |
193 | -#endif /* not G_GNUC_MAY_ALIAS */ | |
194 | - | |
195 | -#if ! defined (G_LIKELY) || ! defined (G_UNLIKELY) | |
196 | -# if defined (__GNUC__) && __GNUC__ > 2 && defined (__OPTIMIZE__) | |
197 | -# define _G_BOOLEAN_EXPR(expr) \ | |
198 | - __extension__ ({ \ | |
199 | - int _g_boolean_var_; \ | |
200 | - if (expr) \ | |
201 | - _g_boolean_var_ = 1; \ | |
202 | - else \ | |
203 | - _g_boolean_var_ = 0; \ | |
204 | - _g_boolean_var_; \ | |
205 | - }) | |
206 | -# ifndef G_LIKELY | |
207 | -# define G_LIKELY(expr) (__builtin_expect(_G_BOOLEAN_EXPR(expr),1)) | |
208 | -# endif /* not G_LIKELY */ | |
209 | -# ifndef G_UNLIKELY | |
210 | -# define G_UNLIKELY(expr) (__builtin_expect(_G_BOOLEAN_EXPR(expr),0)) | |
211 | -# endif /* not G_UNLIKELY */ | |
212 | -# else /* not defined (__GNUC__) && __GNUC__ > 2 && defined (__OPTIMIZE__) */ | |
213 | -# ifndef G_LIKELY | |
214 | -# define G_LIKELY(expr) (expr) | |
215 | -# endif /* not G_LIKELY */ | |
216 | -# ifndef G_UNLIKELY | |
217 | -# define G_UNLIKELY(expr) (expr) | |
218 | -# endif /* not G_UNLIKELY */ | |
219 | -# endif /* not defined (__GNUC__) && __GNUC__ > 2 && defined (__OPTIMIZE__) */ | |
220 | -#endif /* ! defined (G_LIKELY) || ! defined (G_UNLIKELY) */ | |
221 | - | |
222 | - | |
223 | -#ifndef G_STRFUNC | |
224 | -# if defined (__GNUC__) | |
225 | -# define G_STRFUNC ((const char*) (__PRETTY_FUNCTION__)) | |
226 | -# elif defined (G_HAVE_ISO_VARARGS) | |
227 | -# define G_STRFUNC ((const char*) (__func__)) | |
228 | -# else | |
229 | -# define G_STRFUNC ((const char*) ("???")) | |
230 | -# endif | |
231 | -#endif /* not G_STRFUNC */ | |
232 | - | |
233 | - | |
234 | -#ifndef G_GINT16_MODIFIER | |
235 | -# define G_GINT16_MODIFIER "h" | |
236 | -#endif /* not G_GINT16_MODIFIER */ | |
237 | -#ifndef G_GINT32_MODIFIER | |
238 | -# define G_GINT32_MODIFIER "" | |
239 | -#endif /* not G_GINT32_MODIFIER */ | |
240 | -#ifndef G_GINT64_MODIFIER | |
241 | -# define G_GINT64_MODIFIER "ll" | |
242 | -#endif /* not G_GINT64_MODIFIER */ | |
243 | -#ifndef G_GSIZE_MODIFIER | |
244 | -# define G_GSIZE_MODIFIER "" | |
245 | -#endif /* not G_GSIZE_MODIFIER */ | |
246 | -#ifndef G_GSIZE_FORMAT | |
247 | -# define G_GSIZE_FORMAT "u" | |
248 | -#endif /* not G_GSIZE_FORMAT */ | |
249 | -#ifndef G_GSSIZE_FORMAT | |
250 | -# define G_GSSIZE_FORMAT "i" | |
251 | -#endif /* not G_GSSIZE_FORMAT */ | |
252 | -#ifndef G_GOFFSET_MODIFIER | |
253 | -# define G_GOFFSET_MODIFIER G_GINT64_MODIFIER | |
254 | -#endif /* not G_GOFFSET_MODIFIER */ | |
255 | -#ifndef G_GOFFSET_FORMAT | |
256 | -# define G_GOFFSET_FORMAT G_GINT64_FORMAT | |
257 | -#endif /* not G_GOFFSET_FORMAT */ | |
258 | -#ifndef G_GINTPTR_MODIFIER | |
259 | -# define G_GINTPTR_MODIFIER "l" | |
260 | -#endif /* not G_GINTPTR_MODIFIER */ | |
261 | -#ifndef G_GINTPTR_FORMAT | |
262 | -# define G_GINTPTR_FORMAT "li" | |
263 | -#endif /* not G_GINTPTR_FORMAT */ | |
264 | -#ifndef G_GUINTPTR_FORMAT | |
265 | -# define G_GUINTPTR_FORMAT "lu" | |
266 | -#endif /* not G_GUINTPTR_FORMAT */ | |
267 | - | |
268 | - | |
269 | -#define g_strcpy(dest,src) g_strlcpy(dest,src,G_MAXSIZE) | |
270 | -#define g_strncpy(dest,src,n) ((dest)&&(src)?strncpy(dest,src,n):(dest)) | |
271 | -#define g_strcat(dest,src) g_strlcat(dest,src,G_MAXSIZE) | |
272 | -#define g_strncat(dest,src,n) ((dest)&&(src)?strncat(dest,src,n):(dest)) | |
273 | -#if GLIB_CHECK_VERSION(2,16,0) | |
274 | -# define g_strcmp g_strcmp0 | |
275 | -#else /* not GLIB_CHECK_VERSION(2,16,0) */ | |
276 | -# define g_strcmp(s1,s2) ((s1)&&(s2)?strcmp(s1,s2):0) | |
277 | -#endif /* not GLIB_CHECK_VERSION(2,16,0) */ | |
278 | -#define g_strncmp(s1,s2,n) ((s1)&&(s2)?strncmp(s1,s2,n):0) | |
279 | -#define g_strchr(s,c) ((s)?strchr(s,c):NULL) | |
280 | -#define g_strrchr(s,c) ((s)?strrchr(s,c):NULL) | |
281 | -#define g_strspn(s1,s2) ((s1)&&(s2)?strspn(s1,s2):0) | |
282 | -#define g_strcspn(s1,s2) ((s1)&&(s2)?strcspn(s1,s2):0) | |
283 | -#define g_strpbrk(s1,s2) ((s1)&&(s2)?strpbrk(s1,s2):NULL) | |
284 | -#define g_strstr(haystack,needle) g_strstr_len(haystack,g_strlen(haystack),needle) | |
285 | -#define g_strlen(s) ((s)?strlen(s):0) | |
286 | -#define g_strtok(s,delim) ((delim)?strtok(s,delim):NULL) | |
287 | -#define g_memcmp(s1,s2,n) ((s1)&&(s2)?memcmp(s1,s2,n):0) | |
288 | -#define g_memchr(s,c,n) ((s)?memchr(s,c,n):NULL) | |
289 | -#define g_memset(s,c,n) ((s)?memset(s,c,n):(s)) | |
290 | -#if ! GLIB_CHECK_VERSION(2,2,0) | |
291 | -# define g_str_has_prefix(str,prefix) ((str)&&(prefix)&&(strncmp(str,prefix,strlen(prefix))==0)) | |
292 | -# define g_str_has_suffix(str,suffix) ((str)&&(suffix)&&(strlen(str)>strlen(suffix))&&(strcmp((str)+strlen(str)-strlen(suffix),suffix)==0)) | |
293 | -# define g_printf printf | |
294 | -# define g_vprintf vprintf | |
295 | -# define g_fprintf fprintf | |
296 | -# define g_vfprintf vfprintf | |
297 | -# define g_sprintf sprintf | |
298 | -# define g_vsprintf vsprintf | |
299 | -# define g_vasprintf vasprintf | |
300 | -# define g_ascii_strtoull strtoul | |
301 | -#endif /* not GLIB_CHECK_VERSION(2,2,0) */ | |
302 | -#if ! GLIB_CHECK_VERSION(2,12,0) | |
303 | -# define g_ascii_strtoll strtol | |
304 | -#endif /* not GLIB_CHECK_VERSION(2,12,0) */ | |
305 | -#if ! GLIB_CHECK_VERSION(2,22,0) | |
306 | -# define g_mapped_file_unref g_mapped_file_free | |
307 | -#endif /* not GLIB_CHECK_VERSION(2,22,0) */ | |
308 | -#ifdef G_OS_WIN32 | |
309 | -# define g_strfilecmp g_ascii_strcasecmp | |
310 | -# define g_strfilencmp g_ascii_strncasecmp | |
311 | -#else /* not G_OS_WIN32 */ | |
312 | -# define g_strfilecmp g_strcmp | |
313 | -# define g_strfilencmp g_strncmp | |
314 | -#endif /* not G_OS_WIN32 */ | |
315 | - | |
316 | - | |
317 | -#if GLIB_CHECK_VERSION(2,4,0) | |
318 | -# include <glib/gi18n.h> | |
319 | -#else /* not GLIB_CHECK_VERSION(2,4,0) */ | |
320 | -# ifdef ENABLE_NLS | |
321 | -# include <libintl.h> | |
322 | -# define _(String) dgettext(PACKAGE,String) | |
323 | -# ifdef gettext_noop | |
324 | -# define N_(String) gettext_noop(String) | |
325 | -# else /* not gettext_noop */ | |
326 | -# define N_(String) (String) | |
327 | -# endif /* not gettext_noop */ | |
328 | -# define Q_(String) g_strip_context((String),gettext(String)) | |
329 | -# else /* not ENABLE_NLS */ | |
330 | -# define _(String) (String) | |
331 | -# define N_(String) (String) | |
332 | -# define Q_(String) (String) | |
333 | -# define textdomain(String) (String) | |
334 | -# define gettext(String) (String) | |
335 | -# define dgettext(Domain,String) (String) | |
336 | -# define dcgettext(Domain,String,Type) (String) | |
337 | -# define bindtextdomain(Domain,Directory) (Domain) | |
338 | -# endif /* not ENABLE_NLS */ | |
339 | -#endif /* not GLIB_CHECK_VERSION(2,4,0) */ | |
340 | - | |
341 | - | |
342 | -#if ! GLIB_CHECK_VERSION(2,10,0) | |
343 | -# define g_intern_string(s) (s) | |
344 | -# define g_intern_static_string(s) (s) | |
345 | -#endif /* not GLIB_CHECK_VERSION(2,10,0) */ | |
346 | - | |
347 | - | |
348 | -#ifndef G_DEFINE_TYPE | |
349 | -# define G_DEFINE_TYPE(TypeName,type_name,TYPE_PARENT) G_DEFINE_TYPE_EXTENDED(TypeName,type_name,TYPE_PARENT,0,{}) | |
350 | -#endif /* not G_DEFINE_TYPE */ | |
351 | -#ifndef G_DEFINE_TYPE_WITH_CODE | |
352 | -# define G_DEFINE_TYPE_WITH_CODE(TypeName,type_name,TYPE_PARENT,CODE) _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName,type_name,TYPE_PARENT,0) {CODE;} _G_DEFINE_TYPE_EXTENDED_END() | |
353 | -#endif /* not G_DEFINE_TYPE_WITH_CODE */ | |
354 | -#ifndef G_DEFINE_ABSTRACT_TYPE | |
355 | -# define G_DEFINE_ABSTRACT_TYPE(TypeName,type_name,TYPE_PARENT) G_DEFINE_TYPE_EXTENDED(TypeName,type_name,TYPE_PARENT,G_TYPE_FLAG_ABSTRACT,{}) | |
356 | -#endif /* not G_DEFINE_ABSTRACT_TYPE */ | |
357 | -#ifndef G_DEFINE_ABSTRACT_TYPE_WITH_CODE | |
358 | -# define G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TypeName,type_name,TYPE_PARENT,CODE) _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName,type_name,TYPE_PARENT,G_TYPE_FLAG_ABSTRACT) {CODE;} _G_DEFINE_TYPE_EXTENDED_END() | |
359 | -#endif /* not G_DEFINE_ABSTRACT_TYPE_WITH_CODE */ | |
360 | -#ifndef G_DEFINE_TYPE_EXTENDED | |
361 | -# define G_DEFINE_TYPE_EXTENDED(TypeName,type_name,TYPE_PARENT,flags,CODE) _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName,type_name,TYPE_PARENT,flags) {CODE;} _G_DEFINE_TYPE_EXTENDED_END() | |
362 | -#endif /* not G_DEFINE_TYPE_EXTENDED */ | |
363 | - | |
364 | - | |
365 | -#ifndef G_IMPLEMENT_INTERFACE | |
366 | -# define G_IMPLEMENT_INTERFACE(TYPE_IFACE,iface_init) | |
367 | - { \ | |
368 | - const GInterfaceInfo g_implement_interface_info = { \ | |
369 | - (GInterfaceInitFunc) iface_init, NULL, NULL \ | |
370 | - }; \ | |
371 | - g_type_add_interface_static (g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \ | |
372 | - } | |
373 | -#endif /* not G_IMPLEMENT_INTERFACE */ | |
374 | - | |
375 | - | |
376 | -#ifndef _G_DEFINE_TYPE_EXTENDED_BEGIN | |
377 | -# define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName,type_name,TYPE_PARENT,flags) \ | |
378 | - \ | |
379 | -static void type_name##_init (TypeName *self); \ | |
380 | -static void type_name##_class_init (TypeName##Class *klass); \ | |
381 | -static gpointer type_name##_parent_class = NULL; \ | |
382 | -static void type_name##_class_intern_init (gpointer klass) \ | |
383 | -{ \ | |
384 | - type_name##_parent_class = g_type_class_peek_parent (klass); \ | |
385 | - type_name##_class_init ((TypeName##Class*) klass); \ | |
386 | -} \ | |
387 | - \ | |
388 | -GType \ | |
389 | -type_name##_get_type (void) \ | |
390 | -{ \ | |
391 | - static GType g_define_type_id = 0; \ | |
392 | - if (G_UNLIKELY (g_define_type_id == 0)) \ | |
393 | - { \ | |
394 | - static const GTypeInfo g_define_type_info = { \ | |
395 | - sizeof (TypeName##Class), \ | |
396 | - NULL, \ | |
397 | - NULL, \ | |
398 | - (GClassInitFunc) type_name##_class_intern_init, \ | |
399 | - NULL, \ | |
400 | - NULL, \ | |
401 | - sizeof (TypeName), \ | |
402 | - 0, \ | |
403 | - (GInstanceInitFunc) type_name##_init, \ | |
404 | - NULL \ | |
405 | - }; \ | |
406 | - \ | |
407 | - g_define_type_id = g_type_register_static (TYPE_PARENT, \ | |
408 | - g_intern_static_string (#TypeName), \ | |
409 | - &g_define_type_info, \ | |
410 | - (GTypeFlags)flags); \ | |
411 | - { | |
412 | -#endif /* not _G_DEFINE_TYPE_EXTENDED_BEGIN */ | |
413 | -#ifndef _G_DEFINE_TYPE_EXTENDED_END | |
414 | -# define _G_DEFINE_TYPE_EXTENDED_END() \ | |
415 | - } \ | |
416 | - } \ | |
417 | - return g_define_type_id; \ | |
418 | -} | |
419 | -#endif /* not _G_DEFINE_TYPE_EXTENDED_END */ | |
420 | - | |
421 | - | |
422 | -#endif /* __GCOMMON_H__ */ |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | Video maid |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -499,6 +499,7 @@ | ||
499 | 499 | } |
500 | 500 | e.cursor = vmaid->cursor; |
501 | 501 | e.select = vmaid->select; |
502 | + e.next = NULL; | |
502 | 503 | for (i = 0; i < 2; i++) |
503 | 504 | e.avi_edit[i] = vmaid->avi_edit[i]; |
504 | 505 | vmaid->cursor = d->cursor; |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | Video maid |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -17,7 +17,6 @@ | ||
17 | 17 | */ |
18 | 18 | #include "keyfile.h" |
19 | 19 | #include "misc/fileio.h" |
20 | -#include "misc/profile.h" | |
21 | 20 | #include "orz/orzhistory.h" |
22 | 21 | |
23 | 22 |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | Video maid |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -17,7 +17,6 @@ | ||
17 | 17 | */ |
18 | 18 | #include "vmaid.h" |
19 | 19 | #include <gdk/gdkrgb.h> |
20 | -#include <locale.h> | |
21 | 20 | #include "file.h" |
22 | 21 | #include "general.h" |
23 | 22 | #include "icons.h" |
@@ -19,7 +19,7 @@ | ||
19 | 19 | #define __VMAID_H__ |
20 | 20 | |
21 | 21 | |
22 | -#include "gcommon.h" | |
22 | +#include "misc/gcommon.h" | |
23 | 23 | #include "avicore/avicore.h" |
24 | 24 | #ifdef G_OS_WIN32 |
25 | 25 | # include <tchar.h> |
@@ -1,3 +1,35 @@ | ||
1 | +2010-06-29 Kazuki Iwamoto <iwm@maid.org> | |
2 | + | |
3 | + * version 2.2.4 | |
4 | + | |
5 | +2010-06-20 Kazuki Iwamoto <iwm@maid.org> | |
6 | + | |
7 | + * src/general.c: initialize e.next | |
8 | + | |
9 | + * Makefile.msc.in | |
10 | + * configure.ac | |
11 | + * avicore/wave.h | |
12 | + * avicore/chunk.h | |
13 | + * avicore/avicore.h | |
14 | + * misc/Makefile.am | |
15 | + * misc/fileio.c | |
16 | + * misc/gcommon.[ch] | |
17 | + * misc/profile.c | |
18 | + * misc/winmain.c | |
19 | + * orz/orzaccel.h | |
20 | + * orz/orzcomm.h | |
21 | + * orz/orzhistory.h | |
22 | + * orz/orzmdi.h | |
23 | + * orz/orzpref.h | |
24 | + * src/keyfile.c | |
25 | + * src/vmaid.[ch] | |
26 | + * w32loader/Makefile.am | |
27 | + * w32loader/ntdll.c | |
28 | + * w32loader/w32brush.h | |
29 | + * w32loader/w32font.h | |
30 | + * w32loader/w32pen.h | |
31 | + * w32loader/windef.h: remove gcommon.h and add misc/gcommon.[ch] | |
32 | + | |
1 | 33 | 2010-05-29 Kazuki Iwamoto <iwm@maid.org> |
2 | 34 | |
3 | 35 | * version 2.2.3 |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | avicore |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -19,7 +19,7 @@ | ||
19 | 19 | #define __WAVE_H__ |
20 | 20 | |
21 | 21 | |
22 | -#include "gcommon.h" | |
22 | +#include "misc/gcommon.h" | |
23 | 23 | |
24 | 24 | |
25 | 25 | G_BEGIN_DECLS |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | avicore |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -19,7 +19,6 @@ | ||
19 | 19 | #define __CHUNK_H__ |
20 | 20 | |
21 | 21 | |
22 | -#include "gcommon.h" | |
23 | 22 | #include "misc/fileio.h" |
24 | 23 | |
25 | 24 |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | avicore |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -19,7 +19,6 @@ | ||
19 | 19 | #define __AVICORE_H__ |
20 | 20 | |
21 | 21 | |
22 | -#include "gcommon.h" | |
23 | 22 | #include "wave.h" |
24 | 23 | #include "misc/bitmap.h" |
25 | 24 |
@@ -0,0 +1,280 @@ | ||
1 | +/* | |
2 | + gcommon | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | + | |
5 | + This program is free software: you can redistribute it and/or modify | |
6 | + it under the terms of the GNU General Public License as published by | |
7 | + the Free Software Foundation, either version 3 of the License, or | |
8 | + (at your option) any later version. | |
9 | + | |
10 | + This program is distributed in the hope that it will be useful, | |
11 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
13 | + GNU General Public License for more details. | |
14 | + | |
15 | + You should have received a copy of the GNU General Public License | |
16 | + along with this program. If not, see <http://www.gnu.org/licenses/>. | |
17 | +*/ | |
18 | +#include "gcommon.h" | |
19 | + | |
20 | + | |
21 | +/****************************************************************************** | |
22 | +* Byte Order Macros * | |
23 | +******************************************************************************/ | |
24 | +guint16 | |
25 | +gcommon_swap_16 (const guint16 val) | |
26 | +{ | |
27 | + return (val >> 8) | (val << 8); | |
28 | +} | |
29 | + | |
30 | + | |
31 | +guint32 | |
32 | +gcommon_swap_32 (const guint32 val) | |
33 | +{ | |
34 | + return ((val & 0x000000ff) << 24) | ((val & 0x0000ff00) << 8) | |
35 | + | ((val & 0x00ff0000) >> 8) | ((val & 0xff000000) >> 24); | |
36 | +} | |
37 | + | |
38 | + | |
39 | +guint64 | |
40 | +gcommon_swap_64 (const guint64 val) | |
41 | +{ | |
42 | + guint8 *p, temp; | |
43 | + guint64 v; | |
44 | + | |
45 | + v = val; | |
46 | + p = (guint8 *)&v; | |
47 | + temp = p[0]; p[0] = p[7]; p[7] = temp; | |
48 | + temp = p[1]; p[1] = p[6]; p[6] = temp; | |
49 | + temp = p[2]; p[2] = p[5]; p[5] = temp; | |
50 | + temp = p[3]; p[3] = p[4]; p[4] = temp; | |
51 | + return v; | |
52 | +} | |
53 | + | |
54 | + | |
55 | +/****************************************************************************** | |
56 | +* String Utility Functions * | |
57 | +******************************************************************************/ | |
58 | +#if ! GLIB_CHECK_VERSION(2,2,0) | |
59 | +gboolean | |
60 | +g_str_has_prefix (const gchar *str, | |
61 | + const gchar *prefix) | |
62 | +{ | |
63 | + return str && prefix && g_strncmp (str, prefix, g_strlen (prefix)) == 0; | |
64 | +} | |
65 | + | |
66 | + | |
67 | +gboolean | |
68 | +g_str_has_suffix (const gchar *str, | |
69 | + const gchar *suffix) | |
70 | +{ | |
71 | + if (str && suffix) | |
72 | + { | |
73 | + gsize len_str, len_suffix; | |
74 | + | |
75 | + len_str = g_strlen (str); | |
76 | + len_suffix = g_strlen (suffix); | |
77 | + if (len_str > len_suffix) | |
78 | + return strcmp (str + len_str - len_suffix, suffix) == 0; | |
79 | + } | |
80 | + return FALSE; | |
81 | +} | |
82 | + | |
83 | + | |
84 | +# ifndef HAVE_VASPRINTF | |
85 | +gint | |
86 | +g_vasprintf (gchar **string, | |
87 | + gchar const *format, | |
88 | + va_list args) | |
89 | +{ | |
90 | + if (string) | |
91 | + { | |
92 | + gchar *str = NULL; | |
93 | + gsize len, length = 0; | |
94 | + | |
95 | + do | |
96 | + { | |
97 | + length += 1024; | |
98 | + if (length > 16416) | |
99 | + { | |
100 | + free (str); | |
101 | + str = NULL; | |
102 | + break; | |
103 | + } | |
104 | + str = g_realloc (str, length * sizeof (gchar)); | |
105 | +# ifdef _MSC_VER | |
106 | + len = _vsnprintf (str, length, format, args); | |
107 | +# else /* not _MSC_VER */ | |
108 | + len = vsnprintf (str, length, format, args); | |
109 | +# endif /* not _MSC_VER */ | |
110 | + } | |
111 | + while (len < 0 || length <= len); | |
112 | + *string = str; | |
113 | + } | |
114 | + return string && *string ? g_strlen (*string) + 1 : -1; | |
115 | +} | |
116 | +# endif /* not HAVE_VASPRINTF */ | |
117 | +#endif /* not GLIB_CHECK_VERSION(2,2,0) */ | |
118 | + | |
119 | + | |
120 | +/****************************************************************************** | |
121 | +* Extended * | |
122 | +******************************************************************************/ | |
123 | +gchar * | |
124 | +g_strcpy (gchar *dest, | |
125 | + const gchar *src) | |
126 | +{ | |
127 | + return g_strncpy (dest, src, G_MAXSIZE); | |
128 | +} | |
129 | + | |
130 | + | |
131 | +gchar * | |
132 | +g_strncpy (gchar *dest, | |
133 | + const gchar *src, | |
134 | + const gsize n) | |
135 | +{ | |
136 | + return dest && src ? strncpy (dest, src, n) : dest; | |
137 | +} | |
138 | + | |
139 | + | |
140 | +gchar * | |
141 | +g_strcat (gchar *dest, | |
142 | + const gchar *src) | |
143 | +{ | |
144 | + return g_strncat (dest, src, G_MAXSIZE); | |
145 | +} | |
146 | + | |
147 | + | |
148 | +gchar * | |
149 | +g_strncat (gchar *dest, | |
150 | + const gchar *src, | |
151 | + const gsize n) | |
152 | +{ | |
153 | + return dest && src ? strncat (dest, src, n) : dest; | |
154 | +} | |
155 | + | |
156 | + | |
157 | +#if ! GLIB_CHECK_VERSION(2,16,0) | |
158 | +gint | |
159 | +g_strcmp (const gchar *s1, | |
160 | + const gchar *s2) | |
161 | +{ | |
162 | + return g_strncmp (s1, s2, G_MAXSIZE); | |
163 | +} | |
164 | +#endif /* not GLIB_CHECK_VERSION(2,16,0) */ | |
165 | + | |
166 | + | |
167 | +gint | |
168 | +g_strncmp (const gchar *s1, | |
169 | + const gchar *s2, | |
170 | + const gsize n) | |
171 | +{ | |
172 | + return s1 && s2 ? strncmp (s1, s2, n) : 0; | |
173 | +} | |
174 | + | |
175 | + | |
176 | +gchar * | |
177 | +g_strchr (const gchar *s, | |
178 | + const gint c) | |
179 | +{ | |
180 | + return s ? strchr (s, c) : NULL; | |
181 | +} | |
182 | + | |
183 | + | |
184 | +gchar * | |
185 | +g_strrchr (const gchar *s, | |
186 | + const gint c) | |
187 | +{ | |
188 | + return s ? strrchr (s, c) : NULL; | |
189 | +} | |
190 | + | |
191 | + | |
192 | +gsize | |
193 | +g_strspn (const gchar *s, | |
194 | + const gchar *accept) | |
195 | +{ | |
196 | + return s && accept ? strspn (s, accept) : 0; | |
197 | +} | |
198 | + | |
199 | + | |
200 | +gsize | |
201 | +g_strcspn (const gchar *s, | |
202 | + const gchar *reject) | |
203 | +{ | |
204 | + return s && reject ? strcspn (s, reject) : 0; | |
205 | +} | |
206 | + | |
207 | + | |
208 | +gchar * | |
209 | +g_strpbrk (const gchar *s, | |
210 | + const gchar *accept) | |
211 | +{ | |
212 | + return s && accept ? strpbrk (s, accept) : NULL; | |
213 | +} | |
214 | + | |
215 | + | |
216 | +gchar * | |
217 | +g_strstr (const gchar *haystack, | |
218 | + const gchar *needle) | |
219 | +{ | |
220 | + return g_strstr_len (haystack, g_strlen (haystack), needle); | |
221 | +} | |
222 | + | |
223 | + | |
224 | +gsize | |
225 | +g_strlen (const gchar *s) | |
226 | +{ | |
227 | + return s ? strlen (s) : 0; | |
228 | +} | |
229 | + | |
230 | + | |
231 | +gchar * | |
232 | +g_strtok (gchar *str, | |
233 | + const gchar *delim) | |
234 | +{ | |
235 | + return delim ? strtok (str, delim) : NULL; | |
236 | +} | |
237 | + | |
238 | + | |
239 | +gint | |
240 | +g_memcmp (gconstpointer s1, | |
241 | + gconstpointer s2, | |
242 | + const gsize n) | |
243 | +{ | |
244 | + return s1 && s2 ? memcmp (s1, s2, n) : 0; | |
245 | +} | |
246 | + | |
247 | + | |
248 | +gpointer | |
249 | +g_memchr (gconstpointer s, | |
250 | + const gint c, | |
251 | + const gsize n) | |
252 | +{ | |
253 | + return s ? memchr (s, c, n) : NULL; | |
254 | +} | |
255 | + | |
256 | + | |
257 | +gpointer | |
258 | +g_memset (gpointer s, | |
259 | + const gint c, | |
260 | + const gsize n) | |
261 | +{ | |
262 | + return s ? memset (s, c, n) : s; | |
263 | +} | |
264 | + | |
265 | + | |
266 | +#ifndef HAVE_ASPRINTF | |
267 | +gint | |
268 | +g_asprintf (gchar **string, | |
269 | + const gchar *format, | |
270 | + ...) | |
271 | +{ | |
272 | + gsize len; | |
273 | + va_list ap; | |
274 | + | |
275 | + va_start (ap, format); | |
276 | + len = g_vasprintf (string, format, ap); | |
277 | + va_end (ap); | |
278 | + return len; | |
279 | +} | |
280 | +#endif /* not HAVE_ASPRINTF */ |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | profile |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -653,12 +653,12 @@ | ||
653 | 653 | return NULL; |
654 | 654 | for (p = profile->list; p; p = p->next) |
655 | 655 | if (p->section && (!glist || !g_list_find_custom (glist, p->section, |
656 | - (GCompareFunc)strcmp))) | |
657 | - glist = g_list_insert_sorted (glist, p->section, (GCompareFunc)strcmp); | |
656 | + (GCompareFunc)g_strcmp))) | |
657 | + glist = g_list_insert_sorted (glist, p->section, (GCompareFunc)g_strcmp); | |
658 | 658 | for (p = profile->sublist; p; p = p->next) |
659 | 659 | if (p->section && (!glist || !g_list_find_custom (glist, p->section, |
660 | - (GCompareFunc)strcmp))) | |
661 | - glist = g_list_insert_sorted (glist, p->section, (GCompareFunc)strcmp); | |
660 | + (GCompareFunc)g_strcmp))) | |
661 | + glist = g_list_insert_sorted (glist, p->section, (GCompareFunc)g_strcmp); | |
662 | 662 | return glist; |
663 | 663 | } |
664 | 664 |
@@ -679,13 +679,13 @@ | ||
679 | 679 | for (p = profile->list; p; p = p->next) |
680 | 680 | if (p->section && p->key && g_strcmp (p->section, section) == 0 |
681 | 681 | && (!glist || !g_list_find_custom (glist, p->key, |
682 | - (GCompareFunc)strcmp))) | |
683 | - glist = g_list_insert_sorted (glist, p->key, (GCompareFunc)strcmp); | |
682 | + (GCompareFunc)g_strcmp))) | |
683 | + glist = g_list_insert_sorted (glist, p->key, (GCompareFunc)g_strcmp); | |
684 | 684 | for (p = profile->sublist; p; p = p->next) |
685 | 685 | if (p->section && p->key && g_strcmp (p->section, section) == 0 |
686 | 686 | && (!glist || !g_list_find_custom (glist, p->key, |
687 | - (GCompareFunc)strcmp))) | |
688 | - glist = g_list_insert_sorted (glist, p->key, (GCompareFunc)strcmp); | |
687 | + (GCompareFunc)g_strcmp))) | |
688 | + glist = g_list_insert_sorted (glist, p->key, (GCompareFunc)g_strcmp); | |
689 | 689 | return glist; |
690 | 690 | } |
691 | 691 |
@@ -1,10 +1,10 @@ | ||
1 | 1 | /* |
2 | 2 | winmain |
3 | - copyright (c) 1998-2007 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | - This program is free software; you can redistribute it and/or modify | |
5 | + This program is free software: you can redistribute it and/or modify | |
6 | 6 | it under the terms of the GNU General Public License as published by |
7 | - the Free Software Foundation; either version 2 of the License, or | |
7 | + the Free Software Foundation, either version 3 of the License, or | |
8 | 8 | (at your option) any later version. |
9 | 9 | |
10 | 10 | This program is distributed in the hope that it will be useful, |
@@ -13,11 +13,10 @@ | ||
13 | 13 | GNU General Public License for more details. |
14 | 14 | |
15 | 15 | You should have received a copy of the GNU General Public License |
16 | - along with this program; if not, write to the Free Software | |
17 | - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | |
16 | + along with this program. If not, see <http://www.gnu.org/licenses/>. | |
18 | 17 | */ |
18 | +#include "misc/gcommon.h" | |
19 | 19 | #include <windows.h> |
20 | -#include "gcommon.h" | |
21 | 20 | |
22 | 21 | |
23 | 22 | int |
@@ -0,0 +1,1262 @@ | ||
1 | +/* | |
2 | + gcommon | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | + | |
5 | + This program is free software: you can redistribute it and/or modify | |
6 | + it under the terms of the GNU General Public License as published by | |
7 | + the Free Software Foundation, either version 3 of the License, or | |
8 | + (at your option) any later version. | |
9 | + | |
10 | + This program is distributed in the hope that it will be useful, | |
11 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
13 | + GNU General Public License for more details. | |
14 | + | |
15 | + You should have received a copy of the GNU General Public License | |
16 | + along with this program. If not, see <http://www.gnu.org/licenses/>. | |
17 | +*/ | |
18 | +#ifndef __GCOMMON_H__ | |
19 | +#define __GCOMMON_H__ | |
20 | + | |
21 | + | |
22 | +#ifdef HAVE_CONFIG_H | |
23 | +# include "config.h" | |
24 | +#endif /* HAVE_CONFIG_H */ | |
25 | + | |
26 | + | |
27 | +#ifndef _GNU_SOURCE | |
28 | +# define _GNU_SOURCE 1 | |
29 | +#endif /* not _GNU_SOURCE */ | |
30 | +#include <assert.h> | |
31 | +#include <ctype.h> | |
32 | +#include <errno.h> | |
33 | +#include <float.h> | |
34 | +#include <limits.h> | |
35 | +#include <locale.h> | |
36 | +#include <math.h> | |
37 | +#include <setjmp.h> | |
38 | +#include <signal.h> | |
39 | +#include <stdarg.h> | |
40 | +#include <stddef.h> | |
41 | +#include <stdio.h> | |
42 | +#include <stdlib.h> | |
43 | +#include <string.h> | |
44 | +#include <time.h> | |
45 | +#ifdef USE_GTK | |
46 | +# include <gtk/gtk.h> | |
47 | +#else /* not USE_GTK */ | |
48 | +# ifdef HAVE_STDBOOL_H | |
49 | +# include <stdbool.h> | |
50 | +# else /* not HAVE_STDBOOL_H */ | |
51 | +# ifndef __bool_true_false_are_defined | |
52 | +# if ! HAVE__BOOL | |
53 | +# ifdef __cplusplus | |
54 | +typedef bool _Bool; | |
55 | +# else /* not __cplusplus */ | |
56 | +typedef unsigned char _Bool; | |
57 | +# endif /* not __cplusplus */ | |
58 | +# endif /* not HAVE__BOOL */ | |
59 | +# define bool _Bool | |
60 | +# define false 0 | |
61 | +# define true 1 | |
62 | +# define __bool_true_false_are_defined 1 | |
63 | +# endif /* __bool_true_false_are_defined */ | |
64 | +# endif /* not HAVE_STDBOOL_H */ | |
65 | +#endif /* not USE_GTK */ | |
66 | + | |
67 | + | |
68 | +/****************************************************************************** | |
69 | +* Version Information * | |
70 | +******************************************************************************/ | |
71 | +#ifndef GLIB_MAJOR_VERSION | |
72 | +# define GLIB_MAJOR_VERSION 2 | |
73 | +#endif /* not GLIB_MAJOR_VERSION */ | |
74 | +#ifndef GLIB_MINOR_VERSION | |
75 | +# define GLIB_MINOR_VERSION 0 | |
76 | +#endif /* not GLIB_MINOR_VERSION */ | |
77 | +#ifndef GLIB_MICRO_VERSION | |
78 | +# define GLIB_MICRO_VERSION 0 | |
79 | +#endif /* not GLIB_MICRO_VERSION */ | |
80 | +#ifndef GLIB_CHECK_VERSION | |
81 | +# define GLIB_CHECK_VERSION(major,minor,micro) \ | |
82 | + (GLIB_MAJOR_VERSION > (major) || \ | |
83 | + (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION > (minor)) || \ | |
84 | + (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION == (minor) && \ | |
85 | + GLIB_MICRO_VERSION >= (micro))) | |
86 | +#endif /* not GLIB_CHECK_VERSION */ | |
87 | + | |
88 | + | |
89 | +/****************************************************************************** | |
90 | +* Basic Types * | |
91 | +******************************************************************************/ | |
92 | +#ifndef USE_GTK /* USE_GTK */ | |
93 | +typedef bool gboolean; | |
94 | +typedef void *gpointer; | |
95 | +typedef const void *gconstpointer; | |
96 | +typedef char gchar; | |
97 | +typedef unsigned char guchar; | |
98 | +typedef int gint; | |
99 | +typedef unsigned guint; | |
100 | +typedef short gshort; | |
101 | +typedef unsigned short gushort; | |
102 | +typedef long glong; | |
103 | +typedef unsigned long gulong; | |
104 | +# ifdef HAVE_STDINT_H | |
105 | +# include <stdint.h> | |
106 | +typedef int8_t gint8; | |
107 | +typedef uint8_t guint8; | |
108 | +typedef int16_t gint16; | |
109 | +typedef uint16_t guint16; | |
110 | +typedef int32_t gint32; | |
111 | +typedef uint32_t guint32; | |
112 | +typedef int64_t gint64; | |
113 | +typedef uint64_t guint64; | |
114 | +# else /* not HAVE_STDINT_H */ | |
115 | +typedef char gint8; | |
116 | +typedef unsigned char guint8; | |
117 | +typedef short gint16; | |
118 | +typedef unsigned short guint16; | |
119 | +typedef int gint32; | |
120 | +typedef unsigned guint32; | |
121 | +# ifdef _MSC_VER | |
122 | +typedef __int64 gint64; | |
123 | +typedef unsigned __int64 guint64; | |
124 | +# else /* not _MSC_VER */ | |
125 | +typedef long long gint64; | |
126 | +typedef unsigned long long guint64; | |
127 | +# endif /* not _MSC_VER */ | |
128 | +# endif /* not HAVE_STDINT_H */ | |
129 | +typedef float gfloat; | |
130 | +typedef double gdouble; | |
131 | +typedef gulong gsize; | |
132 | +typedef glong gssize; | |
133 | +#endif /* not USE_GTK */ | |
134 | +#if ! GLIB_CHECK_VERSION(2,14,0) | |
135 | +typedef gint64 goffset; | |
136 | +#endif /* not GLIB_CHECK_VERSION(2,14,0) */ | |
137 | +typedef gint64 glonglong; | |
138 | +typedef guint64 gulonglong; | |
139 | +#if ! GLIB_CHECK_VERSION(2,18,0) | |
140 | +typedef glong gintptr; | |
141 | +typedef gulong guintptr; | |
142 | +#endif /* not GLIB_CHECK_VERSION(2,18,0) */ | |
143 | +#ifndef G_HAVE_GINT64 | |
144 | +# define G_HAVE_GINT64 1 | |
145 | +#endif /* not G_HAVE_GINT64 */ | |
146 | +#ifndef G_GINT64_CONSTANT | |
147 | +# ifdef _MSC_VER | |
148 | +# define G_GINT64_CONSTANT(val) (val##i64) | |
149 | +# else /* not _MSC_VER */ | |
150 | +# define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION(val##LL)) | |
151 | +# endif /* not _MSC_VER */ | |
152 | +#endif /* not G_GINT64_CONSTANT */ | |
153 | +#ifndef G_GUINT64_CONSTANT | |
154 | +# ifdef _MSC_VER | |
155 | +# define G_GUINT64_CONSTANT(val) (val##Ui64) | |
156 | +# else /* not _MSC_VER */ | |
157 | +# define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION(val##ULL)) | |
158 | +# endif /* not _MSC_VER */ | |
159 | +#endif /* not G_GUINT64_CONSTANT */ | |
160 | +#ifndef G_GOFFSET_CONSTANT | |
161 | +# define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val) | |
162 | +#endif /* not G_GOFFSET_CONSTANT */ | |
163 | + | |
164 | + | |
165 | +/****************************************************************************** | |
166 | +* Limits of Basic Types * | |
167 | +******************************************************************************/ | |
168 | +#ifndef G_MININT | |
169 | +# define G_MININT INT_MIN | |
170 | +#endif /* not G_MININT */ | |
171 | +#ifndef G_MAXINT | |
172 | +# define G_MAXINT INT_MAX | |
173 | +#endif /* not G_MAXINT */ | |
174 | +#ifndef G_MAXUINT | |
175 | +# define G_MAXUINT UINT_MAX | |
176 | +#endif /* not G_MAXUINT */ | |
177 | +#ifndef G_MINSHORT | |
178 | +# define G_MINSHORT SHRT_MIN | |
179 | +#endif /* not G_MINSHORT */ | |
180 | +#ifndef G_MAXSHORT | |
181 | +# define G_MAXSHORT SHRT_MAX | |
182 | +#endif /* not G_MAXSHORT */ | |
183 | +#ifndef G_MAXUSHORT | |
184 | +# define G_MAXUSHORT USHRT_MAX | |
185 | +#endif /* not G_MAXUSHORT */ | |
186 | +#ifndef G_MINLONG | |
187 | +# define G_MINLONG LONG_MIN | |
188 | +#endif /* not G_MINLONG */ | |
189 | +#ifndef G_MAXLONG | |
190 | +# define G_MAXLONG LONG_MAX | |
191 | +#endif /* not G_MAXLONG */ | |
192 | +#ifndef G_MAXULONG | |
193 | +# define G_MAXULONG ULONG_MAX | |
194 | +#endif /* not G_MAXULONG */ | |
195 | +#ifndef G_MININT8 | |
196 | +# define G_MININT8 ((gint8)0x80) | |
197 | +#endif /* not G_MININT8 */ | |
198 | +#ifndef G_MAXINT8 | |
199 | +# define G_MAXINT8 ((gint8)0x7f) | |
200 | +#endif /* not G_MAXINT8 */ | |
201 | +#ifndef G_MAXUINT8 | |
202 | +# define G_MAXUINT8 ((guint8)0xff) | |
203 | +#endif /* not G_MAXUINT8 */ | |
204 | +#ifndef G_MININT16 | |
205 | +# define G_MININT16 ((gint16)0x8000) | |
206 | +#endif /* not G_MININT16 */ | |
207 | +#ifndef G_MAXINT16 | |
208 | +# define G_MAXINT16 ((gint16)0x7fff) | |
209 | +#endif /* not G_MAXINT16 */ | |
210 | +#ifndef G_MAXUINT16 | |
211 | +# define G_MAXUINT16 ((guint16)0xffff) | |
212 | +#endif /* not G_MAXUINT16 */ | |
213 | +#ifndef G_MININT32 | |
214 | +# define G_MININT32 ((gint32)0x80000000) | |
215 | +#endif /* not G_MININT32 */ | |
216 | +#ifndef G_MAXINT32 | |
217 | +# define G_MAXINT32 ((gint32)0x7fffffff) | |
218 | +#endif /* not G_MAXINT32 */ | |
219 | +#ifndef G_MAXUINT32 | |
220 | +# define G_MAXUINT32 ((guint32)0xffffffff) | |
221 | +#endif /* not G_MAXUINT32 */ | |
222 | +#ifndef G_MININT64 | |
223 | +# define G_MININT64 ((gint64)G_GINT64_CONSTANT(0x8000000000000000)) | |
224 | +#endif /* not G_MININT64 */ | |
225 | +#ifndef G_MAXINT64 | |
226 | +# define G_MAXINT64 G_GINT64_CONSTANT(0x7fffffffffffffff) | |
227 | +#endif /* not G_MAXINT64 */ | |
228 | +#ifndef G_MAXUINT64 | |
229 | +# define G_MAXUINT64 G_GUINT64_CONSTANT(0xffffffffffffffff) | |
230 | +#endif /* not G_MAXUINT64 */ | |
231 | +#ifndef G_MAXSIZE | |
232 | +# define G_MAXSIZE G_MAXUINT | |
233 | +#endif /* not G_MAXSIZE */ | |
234 | +#ifndef G_MINSSIZE | |
235 | +# define G_MINSSIZE G_MININT | |
236 | +#endif /* not G_MINSSIZE */ | |
237 | +#ifndef G_MAXSSIZE | |
238 | +# define G_MAXSSIZE G_MAXINT | |
239 | +#endif /* not G_MAXSSIZE */ | |
240 | +#ifndef G_MINOFFSET | |
241 | +# define G_MINOFFSET G_MININT64 | |
242 | +#endif /* not G_MINOFFSET */ | |
243 | +#ifndef G_MAXOFFSET | |
244 | +# define G_MAXOFFSET G_MAXINT64 | |
245 | +#endif /* not G_MAXOFFSET */ | |
246 | +#ifndef G_MINFLOAT | |
247 | +# define G_MINFLOAT FLT_MIN | |
248 | +#endif /* not G_MINFLOAT */ | |
249 | +#ifndef G_MAXFLOAT | |
250 | +# define G_MAXFLOAT FLT_MAX | |
251 | +#endif /* not G_MAXFLOAT */ | |
252 | +#ifndef G_MINDOUBLE | |
253 | +# define G_MINDOUBLE DBL_MIN | |
254 | +#endif /* not G_MINDOUBLE */ | |
255 | +#ifndef G_MAXDOUBLE | |
256 | +# define G_MAXDOUBLE DBL_MAX | |
257 | +#endif /* not G_MAXDOUBLE */ | |
258 | + | |
259 | + | |
260 | +/****************************************************************************** | |
261 | +* Standard Macros * | |
262 | +******************************************************************************/ | |
263 | +#ifndef USE_GTK | |
264 | +# ifdef _MSC_VER | |
265 | +# define G_OS_WIN32 | |
266 | +# else /* not _MSC_VER */ | |
267 | +# define G_OS_UNIX | |
268 | +# endif /* not _MSC_VER */ | |
269 | +#endif /* not USE_GTK */ | |
270 | +#ifdef G_OS_WIN32 | |
271 | +# ifndef G_DIR_SEPARATOR | |
272 | +# define G_DIR_SEPARATOR '\\' | |
273 | +# endif /* not G_DIR_SEPARATOR */ | |
274 | +# ifndef G_DIR_SEPARATOR_S | |
275 | +# define G_DIR_SEPARATOR_S "\\" | |
276 | +# endif /* not G_DIR_SEPARATOR_S */ | |
277 | +# ifndef G_IS_DIR_SEPARATOR | |
278 | +# define G_IS_DIR_SEPARATOR(c) ((c)==G_DIR_SEPARATOR||(c)=='/') | |
279 | +# endif /* not G_IS_DIR_SEPARATOR */ | |
280 | +# ifndef G_SEARCHPATH_SEPARATOR | |
281 | +# define G_SEARCHPATH_SEPARATOR ';' | |
282 | +# endif /* not G_SEARCHPATH_SEPARATOR */ | |
283 | +# ifndef G_SEARCHPATH_SEPARATOR_S | |
284 | +# define G_SEARCHPATH_SEPARATOR_S ";" | |
285 | +# endif /* not G_SEARCHPATH_SEPARATOR_S */ | |
286 | +#else /* not G_OS_WIN32 */ | |
287 | +# ifndef G_DIR_SEPARATOR | |
288 | +# define G_DIR_SEPARATOR '/' | |
289 | +# endif /* not G_DIR_SEPARATOR */ | |
290 | +# ifndef G_DIR_SEPARATOR_S | |
291 | +# define G_DIR_SEPARATOR_S "/" | |
292 | +# endif /* not G_DIR_SEPARATOR_S */ | |
293 | +# ifndef G_IS_DIR_SEPARATOR | |
294 | +# define G_IS_DIR_SEPARATOR(c) ((c)==G_DIR_SEPARATOR) | |
295 | +# endif /* not G_IS_DIR_SEPARATOR */ | |
296 | +# ifndef G_SEARCHPATH_SEPARATOR | |
297 | +# define G_SEARCHPATH_SEPARATOR ':' | |
298 | +# endif /* not G_SEARCHPATH_SEPARATOR */ | |
299 | +# ifndef G_SEARCHPATH_SEPARATOR_S | |
300 | +# define G_SEARCHPATH_SEPARATOR_S ":" | |
301 | +# endif /* not G_SEARCHPATH_SEPARATOR_S */ | |
302 | +#endif /* not G_OS_WIN32 */ | |
303 | +#ifndef TRUE | |
304 | +# define TRUE true | |
305 | +#endif /* not TRUE */ | |
306 | +#ifndef FALSE | |
307 | +# define FALSE false | |
308 | +#endif /* not FALSE */ | |
309 | +#ifndef NULL | |
310 | +# define NULL 0 | |
311 | +#endif /* not NULL */ | |
312 | +#ifndef MIN | |
313 | +# define MIN(a,b) (((a)<(b))?(a):(b)) | |
314 | +#endif /* not MIN */ | |
315 | +#ifndef MAX | |
316 | +# define MAX(a,b) (((a)>(b))?(a):(b)) | |
317 | +#endif /* not MAX */ | |
318 | +#ifndef ABS | |
319 | +# define ABS(a) (((a)<0)?-(a):(a)) | |
320 | +#endif /* not ABS */ | |
321 | +#ifndef CLAMP | |
322 | +# define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x))) | |
323 | +#endif /* not CLAMP */ | |
324 | +#ifndef G_STRUCT_MEMBER | |
325 | +# define G_STRUCT_MEMBER(member_type,struct_p,struct_offset) \ | |
326 | + (*(member_type *)G_STRUCT_MEMBER_P((struct_p),(struct_offset))) | |
327 | +#endif /* not G_STRUCT_MEMBER */ | |
328 | +#ifndef G_STRUCT_MEMBER_P | |
329 | +# define G_STRUCT_MEMBER_P(struct_p,struct_offset) \ | |
330 | + ((gpointer)((guint8 *)(struct_p)+(glong)(struct_offset))) | |
331 | +#endif /* not G_STRUCT_MEMBER_P */ | |
332 | +#ifndef G_STRUCT_OFFSET | |
333 | +# define G_STRUCT_OFFSET(struct_type,member) ((glong)((guint8 *)&((struct_type*)0)->member)) | |
334 | +#endif /* not G_STRUCT_OFFSET */ | |
335 | +#ifndef G_MEM_ALIGN | |
336 | +# define G_MEM_ALIGN sizeof(gpointer) | |
337 | +#endif /* not G_MEM_ALIGN */ | |
338 | +#ifndef G_CONST_RETURN | |
339 | +# define G_CONST_RETURN const | |
340 | +#endif /* not G_CONST_RETURN */ | |
341 | + | |
342 | + | |
343 | +/****************************************************************************** | |
344 | +* Type Conversion Macros * | |
345 | +******************************************************************************/ | |
346 | +#ifndef GINT_TO_POINTER | |
347 | +# define GINT_TO_POINTER(i) ((gpointer)(glong)(i)) | |
348 | +#endif /* not GINT_TO_POINTER */ | |
349 | +#ifndef GPOINTER_TO_INT | |
350 | +# define GPOINTER_TO_INT(p) ((gint)(glong)(p)) | |
351 | +#endif /* not GPOINTER_TO_INT */ | |
352 | +#ifndef GUINT_TO_POINTER | |
353 | +# define GUINT_TO_POINTER(u) ((gpointer)(gulong)(u)) | |
354 | +#endif /* not GUINT_TO_POINTER */ | |
355 | +#ifndef GPOINTER_TO_UINT | |
356 | +# define GPOINTER_TO_UINT(p) ((guint)(gulong)(p)) | |
357 | +#endif /* not GPOINTER_TO_UINT */ | |
358 | +#ifndef GSIZE_TO_POINTER | |
359 | +# define GSIZE_TO_POINTER(s) ((gpointer)(gsize)(s)) | |
360 | +#endif /* not GSIZE_TO_POINTER */ | |
361 | +#ifndef GPOINTER_TO_SIZE | |
362 | +# define GPOINTER_TO_SIZE(p) ((gsize)(p)) | |
363 | +#endif /* not GPOINTER_TO_SIZE */ | |
364 | + | |
365 | + | |
366 | +/****************************************************************************** | |
367 | +* Byte Order Macros * | |
368 | +******************************************************************************/ | |
369 | +#ifndef G_LITTLE_ENDIAN | |
370 | +# define G_LITTLE_ENDIAN 1234 | |
371 | +#endif /* not G_LITTLE_ENDIAN */ | |
372 | +#ifndef G_BIG_ENDIAN | |
373 | +# define G_BIG_ENDIAN 4321 | |
374 | +#endif /* not G_BIG_ENDIAN */ | |
375 | +#ifndef GINT_SWAP_LE_BE | |
376 | +# define GINT_SWAP_LE_BE(val) GINT32_SWAP_LE_BE(val) | |
377 | +#endif /* not GINT_SWAP_LE_BE */ | |
378 | +#ifndef GUINT_SWAP_LE_BE | |
379 | +# define GUINT_SWAP_LE_BE(val) GUINT32_SWAP_LE_BE(val) | |
380 | +#endif /* not GUINT_SWAP_LE_BE */ | |
381 | +#ifndef GLONG_SWAP_LE_BE | |
382 | +# define GLONG_SWAP_LE_BE(val) GINT32_SWAP_LE_BE(val) | |
383 | +#endif /* not GLONG_SWAP_LE_BE */ | |
384 | +#ifndef GULONG_SWAP_LE_BE | |
385 | +# define GULONG_SWAP_LE_BE(val) GUINT32_SWAP_LE_BE(val) | |
386 | +#endif /* not GULONG_SWAP_LE_BE */ | |
387 | +#ifndef GSIZE_SWAP_LE_BE | |
388 | +# define GSIZE_SWAP_LE_BE(val) GINT32_SWAP_LE_BE(val) | |
389 | +#endif /* not GSIZE_SWAP_LE_BE */ | |
390 | +#ifndef GSSIZE_SWAP_LE_BE | |
391 | +# define GSSIZE_SWAP_LE_BE(val) GUINT32_SWAP_LE_BE(val) | |
392 | +#endif /* not GSSIZE_SWAP_LE_BE */ | |
393 | +#ifndef GINT16_SWAP_LE_BE | |
394 | +# define GINT16_SWAP_LE_BE(val) ((gint16)(GUINT16_SWAP_LE_BE(val))) | |
395 | +#endif /* not GINT16_SWAP_LE_BE */ | |
396 | +#ifndef GUINT16_SWAP_LE_BE | |
397 | +# define GUINT16_SWAP_LE_BE(val) gcommon_swap_16(val) | |
398 | +guint16 gcommon_swap_16 (const guint16 val); | |
399 | +#endif /* not GUINT16_SWAP_LE_BE */ | |
400 | +#ifndef GINT32_SWAP_LE_BE | |
401 | +# define GINT32_SWAP_LE_BE(val) ((gint32)(GUINT32_SWAP_LE_BE(val))) | |
402 | +#endif /* not GINT32_SWAP_LE_BE */ | |
403 | +#ifndef GUINT32_SWAP_LE_BE | |
404 | +# define GUINT32_SWAP_LE_BE(val) gcommon_swap_32(val) | |
405 | +guint32 gcommon_swap_32 (const guint32 val); | |
406 | +#endif /* not GUINT32_SWAP_LE_BE */ | |
407 | +#ifndef GINT64_SWAP_LE_BE | |
408 | +# define GINT64_SWAP_LE_BE(val) ((gint64)(GUINT64_SWAP_LE_BE(val))) | |
409 | +#endif /* not GINT64_SWAP_LE_BE */ | |
410 | +#ifndef GUINT64_SWAP_LE_BE | |
411 | +# define GUINT64_SWAP_LE_BE(val) gcommon_swap_64(val) | |
412 | +guint64 gcommon_swap_64 (const guint64 val); | |
413 | +#endif /* not GUINT64_SWAP_LE_BE */ | |
414 | +#ifdef WORDS_BIGENDIAN | |
415 | +# ifndef G_BYTE_ORDER | |
416 | +# define G_BYTE_ORDER G_BIG_ENDIAN | |
417 | +# endif /* not G_BYTE_ORDER */ | |
418 | +# ifndef GINT_TO_BE | |
419 | +# define GINT_TO_BE(val) ((gint)(val)) | |
420 | +# endif /* not GINT_TO_BE */ | |
421 | +# ifndef GINT_TO_LE | |
422 | +# define GINT_TO_LE(val) (GINT_SWAP_LE_BE(val)) | |
423 | +# endif /* not GINT_TO_LE */ | |
424 | +# ifndef GUINT_TO_BE | |
425 | +# define GUINT_TO_BE(val) ((guint)(val)) | |
426 | +# endif /* not GUINT_TO_BE */ | |
427 | +# ifndef GUINT_TO_LE | |
428 | +# define GUINT_TO_LE(val) (GUINT_SWAP_LE_BE(val)) | |
429 | +# endif /* not GUINT_TO_LE */ | |
430 | +# ifndef GLONG_TO_BE | |
431 | +# define GLONG_TO_BE(val) ((glong)(val)) | |
432 | +# endif /* not GLONG_TO_BE */ | |
433 | +# ifndef GLONG_TO_LE | |
434 | +# define GLONG_TO_LE(val) (GLONG_SWAP_LE_BE(val)) | |
435 | +# endif /* not GLONG_TO_LE */ | |
436 | +# ifndef GULONG_TO_BE | |
437 | +# define GULONG_TO_BE(val) ((gulong)(val)) | |
438 | +# endif /* not GULONG_TO_BE */ | |
439 | +# ifndef GULONG_TO_LE | |
440 | +# define GULONG_TO_LE(val) (GULONG_SWAP_LE_BE(val)) | |
441 | +# endif /* not GULONG_TO_LE */ | |
442 | +# ifndef GSIZE_TO_BE | |
443 | +# define GSIZE_TO_BE(val) ((gsize)(val)) | |
444 | +# endif /* not GSIZE_TO_BE */ | |
445 | +# ifndef GSIZE_TO_LE | |
446 | +# define GSIZE_TO_LE(val) (GSIZE_SWAP_LE_BE(val)) | |
447 | +# endif /* not GSIZE_TO_LE */ | |
448 | +# ifndef GSSIZE_TO_BE | |
449 | +# define GSSIZE_TO_BE(val) ((gssize)(val)) | |
450 | +# endif /* not GSSIZE_TO_BE */ | |
451 | +# ifndef GSSIZE_TO_LE | |
452 | +# define GSSIZE_TO_LE(val) (GSSIZE_SWAP_LE_BE(val)) | |
453 | +# endif /* not GSSIZE_TO_LE */ | |
454 | +# ifndef GINT16_TO_BE | |
455 | +# define GINT16_TO_BE(val) ((gint16)(val)) | |
456 | +# endif /* not GINT16_TO_BE */ | |
457 | +# ifndef GINT16_TO_LE | |
458 | +# define GINT16_TO_LE(val) (GINT16_SWAP_LE_BE(val)) | |
459 | +# endif /* not GINT16_TO_LE */ | |
460 | +# ifndef GUINT16_TO_BE | |
461 | +# define GUINT16_TO_BE(val) ((guint16)(val)) | |
462 | +# endif /* not GUINT16_TO_BE */ | |
463 | +# ifndef GUINT16_TO_LE | |
464 | +# define GUINT16_TO_LE(val) (GUINT16_SWAP_LE_BE(val)) | |
465 | +# endif /* not GUINT16_TO_LE */ | |
466 | +# ifndef GINT32_TO_BE | |
467 | +# define GINT32_TO_BE(val) ((gint32)(val)) | |
468 | +# endif /* not GINT32_TO_BE */ | |
469 | +# ifndef GINT32_TO_LE | |
470 | +# define GINT32_TO_LE(val) (GINT32_SWAP_LE_BE(val)) | |
471 | +# endif /* not GINT32_TO_LE */ | |
472 | +# ifndef GUINT32_TO_BE | |
473 | +# define GUINT32_TO_BE(val) ((guint32)(val)) | |
474 | +# endif /* not GUINT32_TO_BE */ | |
475 | +# ifndef GUINT32_TO_LE | |
476 | +# define GUINT32_TO_LE(val) (GUINT32_SWAP_LE_BE(val)) | |
477 | +# endif /* not GUINT32_TO_LE */ | |
478 | +# ifndef GINT64_TO_BE | |
479 | +# define GINT64_TO_BE(val) ((gint64)(val)) | |
480 | +# endif /* not GINT64_TO_BE */ | |
481 | +# ifndef GINT64_TO_LE | |
482 | +# define GINT64_TO_LE(val) (GINT642_SWAP_LE_BE(val)) | |
483 | +# endif /* not GINT64_TO_LE */ | |
484 | +# ifndef GUINT64_TO_BE | |
485 | +# define GUINT64_TO_BE(val) ((guint64)(val)) | |
486 | +# endif /* not GUINT64_TO_BE */ | |
487 | +# ifndef GUINT64_TO_LE | |
488 | +# define GUINT64_TO_LE(val) (GUINT64_SWAP_LE_BE(val)) | |
489 | +# endif /* not GUINT64_TO_LE */ | |
490 | +# ifndef GINT_FROM_BE | |
491 | +# define GINT_FROM_BE(val) ((gint)(val)) | |
492 | +# endif /* not GINT_FROM_BE */ | |
493 | +# ifndef GINT_FROM_LE | |
494 | +# define GINT_FROM_LE(val) (GINT_SWAP_LE_BE(val)) | |
495 | +# endif /* not GINT_FROM_LE */ | |
496 | +# ifndef GUINT_FROM_BE | |
497 | +# define GUINT_FROM_BE(val) ((guint)(val)) | |
498 | +# endif /* not GUINT_FROM_BE */ | |
499 | +# ifndef GUINT_FROM_LE | |
500 | +# define GUINT_FROM_LE(val) (GUINT_SWAP_LE_BE(val)) | |
501 | +# endif /* not GUINT_FROM_LE */ | |
502 | +# ifndef GLONG_FROM_BE | |
503 | +# define GLONG_FROM_BE(val) ((glong)(val)) | |
504 | +# endif /* not GLONG_FROM_BE */ | |
505 | +# ifndef GLONG_FROM_LE | |
506 | +# define GLONG_FROM_LE(val) (GLONG_SWAP_LE_BE(val)) | |
507 | +# endif /* not GLONG_FROM_LE */ | |
508 | +# ifndef GULONG_FROM_BE | |
509 | +# define GULONG_FROM_BE(val) ((gulong)(val)) | |
510 | +# endif /* not GULONG_FROM_BE */ | |
511 | +# ifndef GULONG_FROM_LE | |
512 | +# define GULONG_FROM_LE(val) (GULONG_SWAP_LE_BE(val)) | |
513 | +# endif /* not GULONG_FROM_LE */ | |
514 | +# ifndef GSIZE_FROM_BE | |
515 | +# define GSIZE_FROM_BE(val) ((gsize)(val)) | |
516 | +# endif /* not GSIZE_FROM_BE */ | |
517 | +# ifndef GSIZE_FROM_LE | |
518 | +# define GSIZE_FROM_LE(val) (GSIZE_SWAP_LE_BE(val)) | |
519 | +# endif /* not GSIZE_FROM_LE */ | |
520 | +# ifndef GSSIZE_FROM_BE | |
521 | +# define GSSIZE_FROM_BE(val) ((gssize)(val)) | |
522 | +# endif /* not GSSIZE_FROM_BE */ | |
523 | +# ifndef GSSIZE_FROM_LE | |
524 | +# define GSSIZE_FROM_LE(val) (GSSIZE_SWAP_LE_BE(val)) | |
525 | +# endif /* not GSSIZE_FROM_LE */ | |
526 | +# ifndef GINT16_FROM_BE | |
527 | +# define GINT16_FROM_BE(val) ((gint)(val)) | |
528 | +# endif /* not GINT16_FROM_BE */ | |
529 | +# ifndef GINT16_FROM_LE | |
530 | +# define GINT16_FROM_LE(val) (GINT16_SWAP_LE_BE(val)) | |
531 | +# endif /* not GINT16_FROM_LE */ | |
532 | +# ifndef GUINT16_FROM_BE | |
533 | +# define GUINT16_FROM_BE(val) ((guint16)(val)) | |
534 | +# endif /* not GUINT16_FROM_BE */ | |
535 | +# ifndef GUINT16_FROM_LE | |
536 | +# define GUINT16_FROM_LE(val) (GUINT16_SWAP_LE_BE(val)) | |
537 | +# endif /* not GUINT16_FROM_LE */ | |
538 | +# ifndef GINT32_FROM_BE | |
539 | +# define GINT32_FROM_BE(val) ((gint32)(val)) | |
540 | +# endif /* not GINT32_FROM_BE */ | |
541 | +# ifndef GINT32_FROM_LE | |
542 | +# define GINT32_FROM_LE(val) (GINT32_SWAP_LE_BE(val)) | |
543 | +# endif /* not GINT32_FROM_LE */ | |
544 | +# ifndef GUINT32_FROM_BE | |
545 | +# define GUINT32_FROM_BE(val) ((guint32)(val)) | |
546 | +# endif /* not GUINT32_FROM_BE */ | |
547 | +# ifndef GUINT32_FROM_LE | |
548 | +# define GUINT32_FROM_LE(val) (GUINT32_SWAP_LE_BE(val)) | |
549 | +# endif /* not GUINT32_FROM_LE */ | |
550 | +# ifndef GINT64_FROM_BE | |
551 | +# define GINT64_FROM_BE(val) ((gint64)(val)) | |
552 | +# endif /* not GINT64_FROM_BE */ | |
553 | +# ifndef GINT64_FROM_LE | |
554 | +# define GINT64_FROM_LE(val) (GINT64_SWAP_LE_BE(val)) | |
555 | +# endif /* not GINT64_FROM_LE */ | |
556 | +# ifndef GUINT64_FROM_BE | |
557 | +# define GUINT64_FROM_BE(val) ((guint64)(val)) | |
558 | +# endif /* not GUINT64_FROM_BE */ | |
559 | +# ifndef GUINT64_FROM_LE | |
560 | +# define GUINT64_FROM_LE(val) (GUINT64_SWAP_LE_BE(val)) | |
561 | +# endif /* not GUINT64_FROM_LE */ | |
562 | +#else /* not WORDS_BIGENDIAN */ | |
563 | +# ifndef G_BYTE_ORDER | |
564 | +# define G_BYTE_ORDER G_LITTLE_ENDIAN | |
565 | +# endif /* not not G_BYTE_ORDER */ | |
566 | +# ifndef GINT_TO_BE | |
567 | +# define GINT_TO_BE(val) (GINT_SWAP_LE_BE(val)) | |
568 | +# endif /* not GINT_TO_BE */ | |
569 | +# ifndef GINT_TO_LE | |
570 | +# define GINT_TO_LE(val) ((gint)(val)) | |
571 | +# endif /* not GINT_TO_LE */ | |
572 | +# ifndef GUINT_TO_BE | |
573 | +# define GUINT_TO_BE(val) (GUINT_SWAP_LE_BE(val)) | |
574 | +# endif /* not GUINT_TO_BE */ | |
575 | +# ifndef GUINT_TO_LE | |
576 | +# define GUINT_TO_LE(val) ((guint)(val)) | |
577 | +# endif /* not GUINT_TO_LE */ | |
578 | +# ifndef GLONG_TO_BE | |
579 | +# define GLONG_TO_BE(val) (GLONG_SWAP_LE_BE(val)) | |
580 | +# endif /* not GLONG_TO_BE */ | |
581 | +# ifndef GLONG_TO_LE | |
582 | +# define GLONG_TO_LE(val) ((glong)(val)) | |
583 | +# endif /* not GLONG_TO_LE */ | |
584 | +# ifndef GULONG_TO_BE | |
585 | +# define GULONG_TO_BE(val) (GULONG_SWAP_LE_BE(val)) | |
586 | +# endif /* not GULONG_TO_BE */ | |
587 | +# ifndef GULONG_TO_LE | |
588 | +# define GULONG_TO_LE(val) ((gulong)(val)) | |
589 | +# endif /* not GULONG_TO_LE */ | |
590 | +# ifndef GSIZE_TO_BE | |
591 | +# define GSIZE_TO_BE(val) (GSIZE_SWAP_LE_BE(val)) | |
592 | +# endif /* not GSIZE_TO_BE */ | |
593 | +# ifndef GSIZE_TO_LE | |
594 | +# define GSIZE_TO_LE(val) ((gsize)(val)) | |
595 | +# endif /* not GSIZE_TO_LE */ | |
596 | +# ifndef GSSIZE_TO_BE | |
597 | +# define GSSIZE_TO_BE(val) (GSSIZE_SWAP_LE_BE(val)) | |
598 | +# endif /* not GSSIZE_TO_BE */ | |
599 | +# ifndef GSSIZE_TO_LE | |
600 | +# define GSSIZE_TO_LE(val) ((gsize)(val)) | |
601 | +# endif /* not GSSIZE_TO_LE */ | |
602 | +# ifndef GINT16_TO_BE | |
603 | +# define GINT16_TO_BE(val) (GINT16_SWAP_LE_BE(val)) | |
604 | +# endif /* not GINT16_TO_BE */ | |
605 | +# ifndef GINT16_TO_LE | |
606 | +# define GINT16_TO_LE(val) ((gint16)(val)) | |
607 | +# endif /* not GINT16_TO_LE */ | |
608 | +# ifndef GUINT16_TO_BE | |
609 | +# define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE(val)) | |
610 | +# endif /* not GUINT16_TO_BE */ | |
611 | +# ifndef GUINT16_TO_LE | |
612 | +# define GUINT16_TO_LE(val) ((guint16)(val)) | |
613 | +# endif /* not GUINT16_TO_LE */ | |
614 | +# ifndef GINT32_TO_BE | |
615 | +# define GINT32_TO_BE(val) (GINT32_SWAP_LE_BE(val)) | |
616 | +# endif /* not GINT32_TO_BE */ | |
617 | +# ifndef GINT32_TO_LE | |
618 | +# define GINT32_TO_LE(val) ((gint32)(val)) | |
619 | +# endif /* not GINT32_TO_LE */ | |
620 | +# ifndef GUINT32_TO_BE | |
621 | +# define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE(val)) | |
622 | +# endif /* not GUINT32_TO_BE */ | |
623 | +# ifndef GUINT32_TO_LE | |
624 | +# define GUINT32_TO_LE(val) ((guint32)(val)) | |
625 | +# endif /* not GUINT32_TO_LE */ | |
626 | +# ifndef GINT64_TO_BE | |
627 | +# define GINT64_TO_BE(val) (GINT64_SWAP_LE_BE(val)) | |
628 | +# endif /* not GINT64_TO_BE */ | |
629 | +# ifndef GINT64_TO_LE | |
630 | +# define GINT64_TO_LE(val) ((gint64)(val)) | |
631 | +# endif /* not GINT64_TO_LE */ | |
632 | +# ifndef GUINT64_TO_BE | |
633 | +# define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE(val)) | |
634 | +# endif /* not GUINT64_TO_BE */ | |
635 | +# ifndef GUINT64_TO_LE | |
636 | +# define GUINT64_TO_LE(val) ((guint64)(val)) | |
637 | +# endif /* not GUINT64_TO_LE */ | |
638 | +# ifndef GINT_FROM_BE | |
639 | +# define GINT_FROM_BE(val) (GINT_SWAP_LE_BE(val)) | |
640 | +# endif /* not GINT_FROM_BE */ | |
641 | +# ifndef GINT_FROM_LE | |
642 | +# define GINT_FROM_LE(val) ((gint)(val)) | |
643 | +# endif /* not GINT_FROM_LE */ | |
644 | +# ifndef GUINT_FROM_BE | |
645 | +# define GUINT_FROM_BE(val) (GUINT_SWAP_LE_BE(val)) | |
646 | +# endif /* not GUINT_FROM_BE */ | |
647 | +# ifndef GUINT_FROM_LE | |
648 | +# define GUINT_FROM_LE(val) ((guint)(val)) | |
649 | +# endif /* not GUINT_FROM_LE */ | |
650 | +# ifndef GLONG_FROM_BE | |
651 | +# define GLONG_FROM_BE(val) (GLONG_SWAP_LE_BE(val)) | |
652 | +# endif /* not GLONG_FROM_BE */ | |
653 | +# ifndef GLONG_FROM_LE | |
654 | +# define GLONG_FROM_LE(val) ((glong)(val)) | |
655 | +# endif /* not GLONG_FROM_LE */ | |
656 | +# ifndef GULONG_FROM_BE | |
657 | +# define GULONG_FROM_BE(val) (GULONG_SWAP_LE_BE(val)) | |
658 | +# endif /* not GULONG_FROM_BE */ | |
659 | +# ifndef GULONG_FROM_LE | |
660 | +# define GULONG_FROM_LE(val) ((gulong)(val)) | |
661 | +# endif /* not GULONG_FROM_LE */ | |
662 | +# ifndef GSIZE_FROM_BE | |
663 | +# define GSIZE_FROM_BE(val) (GSIZE_SWAP_LE_BE(val)) | |
664 | +# endif /* not GSIZE_FROM_BE */ | |
665 | +# ifndef GSIZE_FROM_LE | |
666 | +# define GSIZE_FROM_LE(val) ((gsize)(val)) | |
667 | +# endif /* not GSIZE_FROM_LE */ | |
668 | +# ifndef GSSIZE_FROM_BE | |
669 | +# define GSSIZE_FROM_BE(val) (GSSIZE_SWAP_LE_BE(val)) | |
670 | +# endif /* not GSSIZE_FROM_BE */ | |
671 | +# ifndef GSSIZE_FROM_LE | |
672 | +# define GSSIZE_FROM_LE(val) ((gssize)(val)) | |
673 | +# endif /* not GSSIZE_FROM_LE */ | |
674 | +# ifndef GINT16_FROM_BE | |
675 | +# define GINT16_FROM_BE(val) (GINT16_SWAP_LE_BE(val)) | |
676 | +# endif /* not GINT16_FROM_BE */ | |
677 | +# ifndef GINT16_FROM_LE | |
678 | +# define GINT16_FROM_LE(val) ((gint16)(val)) | |
679 | +# endif /* not GINT16_FROM_LE */ | |
680 | +# ifndef GUINT16_FROM_BE | |
681 | +# define GUINT16_FROM_BE(val) (GUINT16_SWAP_LE_BE(val)) | |
682 | +# endif /* not GUINT16_FROM_BE */ | |
683 | +# ifndef GUINT16_FROM_LE | |
684 | +# define GUINT16_FROM_LE(val) ((guint16)(val)) | |
685 | +# endif /* not GUINT16_FROM_LE */ | |
686 | +# ifndef GINT32_FROM_BE | |
687 | +# define GINT32_FROM_BE(val) (GINT32_SWAP_LE_BE(val)) | |
688 | +# endif /* not GINT32_FROM_BE */ | |
689 | +# ifndef GINT32_FROM_LE | |
690 | +# define GINT32_FROM_LE(val) ((gint32)(val)) | |
691 | +# endif /* not GINT32_FROM_LE */ | |
692 | +# ifndef GUINT32_FROM_BE | |
693 | +# define GUINT32_FROM_BE(val) (GUINT32_SWAP_LE_BE(val)) | |
694 | +# endif /* not GUINT32_FROM_BE */ | |
695 | +# ifndef GUINT32_FROM_LE | |
696 | +# define GUINT32_FROM_LE(val) ((guint32)(val)) | |
697 | +# endif /* not GUINT32_FROM_LE */ | |
698 | +# ifndef GINT64_FROM_BE | |
699 | +# define GINT64_FROM_BE(val) (GINT64_SWAP_LE_BE(val)) | |
700 | +# endif /* not GINT64_FROM_BE */ | |
701 | +# ifndef GINT64_FROM_LE | |
702 | +# define GINT64_FROM_LE(val) ((gint64)(val)) | |
703 | +# endif /* not GINT64_FROM_LE */ | |
704 | +# ifndef GUINT64_FROM_BE | |
705 | +# define GUINT64_FROM_BE(val) (GUINT64_SWAP_LE_BE(val)) | |
706 | +# endif /* not GUINT64_FROM_BE */ | |
707 | +# ifndef GUINT64_FROM_LE | |
708 | +# define GUINT64_FROM_LE(val) ((guint64)(val)) | |
709 | +# endif /* not GUINT64_FROM_LE */ | |
710 | +#endif /* not WORDS_BIGENDIAN */ | |
711 | + | |
712 | + | |
713 | +/****************************************************************************** | |
714 | +* Numerical Definitions * | |
715 | +******************************************************************************/ | |
716 | +#ifndef G_IEEE754_FLOAT_BIAS | |
717 | +# define G_IEEE754_FLOAT_BIAS (127) | |
718 | +#endif /* not G_IEEE754_FLOAT_BIAS */ | |
719 | +#ifndef G_IEEE754_DOUBLE_BIAS | |
720 | +# define G_IEEE754_DOUBLE_BIAS (1023) | |
721 | +#endif /* not G_IEEE754_DOUBLE_BIAS */ | |
722 | +#ifndef G_E | |
723 | +# define G_E 2.7182818284590452353602874713526624977572470937000 | |
724 | +#endif /* not G_E */ | |
725 | +#ifndef G_LN2 | |
726 | +# define G_LN2 0.69314718055994530941723212145817656807550013436026 | |
727 | +#endif /* not G_LN2 */ | |
728 | +#ifndef G_LN10 | |
729 | +# define G_LN10 2.3025850929940456840179914546843642076011014886288 | |
730 | +#endif /* not G_LN10 */ | |
731 | +#ifndef G_PI | |
732 | +# define G_PI 3.1415926535897932384626433832795028841971693993751 | |
733 | +#endif /* not G_PI */ | |
734 | +#ifndef G_PI_2 | |
735 | +# define G_PI_2 1.5707963267948966192313216916397514420985846996876 | |
736 | +#endif /* not G_PI_2 */ | |
737 | +#ifndef G_PI_4 | |
738 | +# define G_PI_4 0.78539816339744830961566084581987572104929234984378 | |
739 | +#endif /* not G_PI_4 */ | |
740 | +#ifndef G_SQRT2 | |
741 | +# define G_SQRT2 1.4142135623730950488016887242096980785696718753769 | |
742 | +#endif /* not G_SQRT2 */ | |
743 | +#ifndef G_LOG_2_BASE_10 | |
744 | +# define G_LOG_2_BASE_10 0.30102999566398119521 | |
745 | +#endif /* not G_LOG_2_BASE_10 */ | |
746 | + | |
747 | + | |
748 | +/****************************************************************************** | |
749 | +* Miscellaneous Macros * | |
750 | +******************************************************************************/ | |
751 | +#ifndef G_INLINE_FUNC | |
752 | +# define G_INLINE_FUNC | |
753 | +#endif /* not G_INLINE_FUNC */ | |
754 | +#ifndef G_STMT_START | |
755 | +# define G_STMT_START do | |
756 | +#endif /* not G_STMT_START */ | |
757 | +#ifndef G_STMT_END | |
758 | +# define G_STMT_END while (0) | |
759 | +#endif /* not G_STMT_END */ | |
760 | +#ifdef __cplusplus | |
761 | +# ifndef G_BEGIN_DECLS | |
762 | +# define G_BEGIN_DECLS extern "C" { | |
763 | +# endif /* not G_BEGIN_DECLS */ | |
764 | +# ifndef G_END_DECLS | |
765 | +# define G_END_DECLS } | |
766 | +# endif /* not G_END_DECLS */ | |
767 | +#else /* not __cplusplus */ | |
768 | +# ifndef G_BEGIN_DECLS | |
769 | +# define G_BEGIN_DECLS | |
770 | +# endif /* not G_BEGIN_DECLS */ | |
771 | +# ifndef G_END_DECLS | |
772 | +# define G_END_DECLS | |
773 | +# endif /* not G_END_DECLS */ | |
774 | +#endif /* not __cplusplus */ | |
775 | +#ifndef G_N_ELEMENTS | |
776 | +# define G_N_ELEMENTS(arr) (sizeof(arr)/sizeof((arr)[0])) | |
777 | +#endif /* not G_N_ELEMENTS */ | |
778 | +#ifndef G_VA_COPY | |
779 | +# if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32)) | |
780 | +# define G_VA_COPY(ap1,ap2) (*(ap1)=*(ap2)) | |
781 | +# elif defined (G_VA_COPY_AS_ARRAY) | |
782 | +# define G_VA_COPY(ap1,ap2) g_memmove((ap1),(ap2),sizeof(va_list)) | |
783 | +# else | |
784 | +# define G_VA_COPY(ap1,ap2) ((ap1)=(ap2)) | |
785 | +# endif | |
786 | +#endif /* not G_VA_COPY */ | |
787 | +#ifndef G_STRINGIFY_ARG | |
788 | +# define G_STRINGIFY_ARG(contents) #contents | |
789 | +#endif /* not G_STRINGIFY_ARG */ | |
790 | +#ifndef G_STRINGIFY | |
791 | +# define G_STRINGIFY(macro_or_string) G_STRINGIFY_ARG(macro_or_string) | |
792 | +#endif /* not G_STRINGIFY */ | |
793 | +#ifndef G_PASTE | |
794 | +# define G_PASTE(identifier1,identifier2) G_PASTE_ARGS(identifier1,identifier2) | |
795 | +#endif /* not G_PASTE */ | |
796 | +#ifndef G_PASTE_ARGS | |
797 | +# define G_PASTE_ARGS(identifier1,identifier2) identifier1##identifier2 | |
798 | +#endif /* not G_PASTE_ARGS */ | |
799 | +#ifndef G_STATIC_ASSERT | |
800 | +# define G_STATIC_ASSERT(expr) typedef struct { char Compile_Time_Assertion[(expr) ? 1 : -1]; } G_PASTE (_GStaticAssert_, __LINE__) | |
801 | +#endif /* not G_STATIC_ASSERT */ | |
802 | +#ifndef G_GNUC_EXTENSION | |
803 | +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8) | |
804 | +# define G_GNUC_EXTENSION __extension__ | |
805 | +# else | |
806 | +# define G_GNUC_EXTENSION | |
807 | +# endif | |
808 | +#endif /* not G_GNUC_EXTENSION */ | |
809 | +#ifndef G_GNUC_CONST | |
810 | +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) | |
811 | +# define G_GNUC_CONST __attribute__((__const__)) | |
812 | +# else | |
813 | +# define G_GNUC_CONST | |
814 | +# endif | |
815 | +#endif /* not G_GNUC_CONST */ | |
816 | +#ifndef G_GNUC_PURE | |
817 | +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
818 | +# define G_GNUC_PURE __attribute__((__pure__)) | |
819 | +# else | |
820 | +# define G_GNUC_PURE | |
821 | +# endif | |
822 | +#endif /* not G_GNUC_PURE */ | |
823 | +#ifndef G_GNUC_MALLOC | |
824 | +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) | |
825 | +# define G_GNUC_MALLOC __attribute__((__malloc__)) | |
826 | +# else | |
827 | +# define G_GNUC_MALLOC | |
828 | +# endif | |
829 | +#endif /* not G_GNUC_MALLOC */ | |
830 | +#ifndef G_GNUC_ALLOC_SIZE | |
831 | +# if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) | |
832 | +# define G_GNUC_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) | |
833 | +# else | |
834 | +# define G_GNUC_ALLOC_SIZE(x) | |
835 | +# endif | |
836 | +#endif /* not G_GNUC_ALLOC_SIZE */ | |
837 | +#ifndef G_GNUC_ALLOC_SIZE2 | |
838 | +# if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) | |
839 | +# define G_GNUC_ALLOC_SIZE2(x,y) __attribute__((__alloc_size__(x,y))) | |
840 | +# else | |
841 | +# define G_GNUC_ALLOC_SIZE2(x,y) | |
842 | +# endif | |
843 | +#endif /* not G_GNUC_ALLOC_SIZE2 */ | |
844 | +#ifndef G_GNUC_DEPRECATED | |
845 | +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) | |
846 | +# define G_GNUC_DEPRECATED __attribute__((__deprecated__)) | |
847 | +# else | |
848 | +# define G_GNUC_DEPRECATED | |
849 | +# endif | |
850 | +#endif /* not G_GNUC_DEPRECATED */ | |
851 | +#ifndef G_GNUC_NORETURN | |
852 | +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) | |
853 | +# define G_GNUC_NORETURN __attribute__((__noreturn__)) | |
854 | +# else | |
855 | +# define G_GNUC_NORETURN | |
856 | +# endif | |
857 | +#endif /* not G_GNUC_NORETURN */ | |
858 | +#ifndef G_GNUC_UNUSED | |
859 | +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) | |
860 | +# define G_GNUC_UNUSED __attribute__((__unused__)) | |
861 | +# else | |
862 | +# define G_GNUC_UNUSED | |
863 | +# endif | |
864 | +#endif /* not G_GNUC_UNUSED */ | |
865 | +#ifndef G_GNUC_PRINTF | |
866 | +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) | |
867 | +# define G_GNUC_PRINTF(format_idx,arg_idx) __attribute__((__format__(__printf__,format_idx,arg_idx))) | |
868 | +# else | |
869 | +# define G_GNUC_PRINTF(format_idx,arg_idx) | |
870 | +# endif | |
871 | +#endif /* not G_GNUC_PRINTF */ | |
872 | +#ifndef G_GNUC_SCANF | |
873 | +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) | |
874 | +# define G_GNUC_SCANF(format_idx,arg_idx) __attribute__((__format__(__scanf__,format_idx,arg_idx))) | |
875 | +# else | |
876 | +# define G_GNUC_SCANF(format_idx,arg_idx) | |
877 | +# endif | |
878 | +#endif /* not G_GNUC_SCANF */ | |
879 | +#ifndef G_GNUC_FORMAT | |
880 | +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) | |
881 | +# define G_GNUC_FORMAT(arg_idx) __attribute__((__format_arg__(arg_idx))) | |
882 | +# else | |
883 | +# define G_GNUC_FORMAT(arg_idx) | |
884 | +# endif | |
885 | +#endif /* not G_GNUC_FORMAT */ | |
886 | +#ifndef G_GNUC_NULL_TERMINATED | |
887 | +# if __GNUC__ >= 4 | |
888 | +# define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) | |
889 | +# else | |
890 | +# define G_GNUC_NULL_TERMINATED | |
891 | +# endif | |
892 | +#endif /* not G_GNUC_NULL_TERMINATED */ | |
893 | +#ifndef G_GNUC_WARN_UNUSED_RESULT | |
894 | +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) | |
895 | +# define G_GNUC_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) | |
896 | +# else | |
897 | +# define G_GNUC_WARN_UNUSED_RESULT | |
898 | +# endif | |
899 | +#endif /* not G_GNUC_WARN_UNUSED_RESULT */ | |
900 | +#ifndef G_GNUC_NO_INSTRUMENT | |
901 | +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) | |
902 | +# define G_GNUC_NO_INSTRUMENT __attribute__((__no_instrument_function__)) | |
903 | +# else | |
904 | +# define G_GNUC_NO_INSTRUMENT | |
905 | +# endif | |
906 | +#endif /* not G_GNUC_NO_INSTRUMENT */ | |
907 | +#ifndef G_GNUC_INTERNAL | |
908 | +# if defined (__SUNPRO_C) && (__SUNPRO_C >= 0x590) | |
909 | +# define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) | |
910 | +# elif defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550) | |
911 | +# define G_GNUC_INTERNAL __hidden | |
912 | +# elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY) | |
913 | +# define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) | |
914 | +# else | |
915 | +# define G_GNUC_INTERNAL | |
916 | +# endif | |
917 | +#endif /* not G_GNUC_INTERNAL */ | |
918 | +#ifndef G_GNUC_MAY_ALIAS | |
919 | +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) | |
920 | +# define G_GNUC_MAY_ALIAS __attribute__((may_alias)) | |
921 | +# else | |
922 | +# define G_GNUC_MAY_ALIAS | |
923 | +# endif | |
924 | +#endif /* not G_GNUC_MAY_ALIAS */ | |
925 | +#if ! defined (G_LIKELY) || ! defined (G_UNLIKELY) | |
926 | +# if defined (__GNUC__) && __GNUC__ > 2 && defined (__OPTIMIZE__) | |
927 | +# define _G_BOOLEAN_EXPR(expr) \ | |
928 | + __extension__ ({ \ | |
929 | + int _g_boolean_var_; \ | |
930 | + if (expr) \ | |
931 | + _g_boolean_var_ = 1; \ | |
932 | + else \ | |
933 | + _g_boolean_var_ = 0; \ | |
934 | + _g_boolean_var_; \ | |
935 | + }) | |
936 | +# ifndef G_LIKELY | |
937 | +# define G_LIKELY(expr) (__builtin_expect(_G_BOOLEAN_EXPR(expr),1)) | |
938 | +# endif /* not G_LIKELY */ | |
939 | +# ifndef G_UNLIKELY | |
940 | +# define G_UNLIKELY(expr) (__builtin_expect(_G_BOOLEAN_EXPR(expr),0)) | |
941 | +# endif /* not G_UNLIKELY */ | |
942 | +# else /* not defined (__GNUC__) && __GNUC__ > 2 && defined (__OPTIMIZE__) */ | |
943 | +# ifndef G_LIKELY | |
944 | +# define G_LIKELY(expr) (expr) | |
945 | +# endif /* not G_LIKELY */ | |
946 | +# ifndef G_UNLIKELY | |
947 | +# define G_UNLIKELY(expr) (expr) | |
948 | +# endif /* not G_UNLIKELY */ | |
949 | +# endif /* not defined (__GNUC__) && __GNUC__ > 2 && defined (__OPTIMIZE__) */ | |
950 | +#endif /* ! defined (G_LIKELY) || ! defined (G_UNLIKELY) */ | |
951 | +#ifndef G_STRLOC | |
952 | +# if defined (__GNUC__) && (__GNUC__ < 3) && ! defined (__cplusplus) | |
953 | +# define G_STRLOC __FILE__ ":" G_STRINGIFY (__LINE__) ":" __PRETTY_FUNCTION__ "()" | |
954 | +# else | |
955 | +# define G_STRLOC __FILE__ ":" G_STRINGIFY (__LINE__) | |
956 | +# endif | |
957 | +#endif /* not G_STRLOC */ | |
958 | +#ifndef G_STRFUNC | |
959 | +# if defined (__GNUC__) | |
960 | +# define G_STRFUNC ((const char*) (__PRETTY_FUNCTION__)) | |
961 | +# elif defined (G_HAVE_ISO_VARARGS) | |
962 | +# define G_STRFUNC ((const char*) (__func__)) | |
963 | +# else | |
964 | +# define G_STRFUNC ((const char*) ("???")) | |
965 | +# endif | |
966 | +#endif /* not G_STRFUNC */ | |
967 | +#ifndef G_GINT16_MODIFIER | |
968 | +# define G_GINT16_MODIFIER "h" | |
969 | +#endif /* not G_GINT16_MODIFIER */ | |
970 | +#ifndef G_GINT16_FORMAT | |
971 | +# define G_GINT16_FORMAT "hi" | |
972 | +#endif /* not G_GINT16_FORMAT */ | |
973 | +#ifndef G_GUINT16_FORMAT | |
974 | +# define G_GUINT16_FORMAT "hu" | |
975 | +#endif /* not G_GUINT16_FORMAT */ | |
976 | +#ifndef G_GINT32_MODIFIER | |
977 | +# define G_GINT32_MODIFIER "" | |
978 | +#endif /* not G_GINT32_MODIFIER */ | |
979 | +#ifndef G_GINT32_FORMAT | |
980 | +# define G_GINT32_FORMAT "i" | |
981 | +#endif /* not G_GINT32_FORMAT */ | |
982 | +#ifndef G_GUINT32_FORMAT | |
983 | +# define G_GUINT32_FORMAT "u" | |
984 | +#endif /* not G_GUINT32_FORMAT */ | |
985 | +#ifndef G_GINT64_MODIFIER | |
986 | +# define G_GINT64_MODIFIER "ll" | |
987 | +#endif /* not G_GINT64_MODIFIER */ | |
988 | +#ifndef G_GINT64_FORMAT | |
989 | +# define G_GINT64_FORMAT "li" | |
990 | +#endif /* not G_GINT64_FORMAT */ | |
991 | +#ifndef G_GUINT64_FORMAT | |
992 | +# define G_GUINT64_FORMAT "lu" | |
993 | +#endif /* not G_GUINT64_FORMAT */ | |
994 | +#ifndef G_GSIZE_MODIFIER | |
995 | +# define G_GSIZE_MODIFIER "" | |
996 | +#endif /* not G_GSIZE_MODIFIER */ | |
997 | +#ifndef G_GSIZE_FORMAT | |
998 | +# define G_GSIZE_FORMAT "u" | |
999 | +#endif /* not G_GSIZE_FORMAT */ | |
1000 | +#ifndef G_GSSIZE_FORMAT | |
1001 | +# define G_GSSIZE_FORMAT "i" | |
1002 | +#endif /* not G_GSSIZE_FORMAT */ | |
1003 | +#ifndef G_GOFFSET_MODIFIER | |
1004 | +# define G_GOFFSET_MODIFIER G_GINT64_MODIFIER | |
1005 | +#endif /* not G_GOFFSET_MODIFIER */ | |
1006 | +#ifndef G_GOFFSET_FORMAT | |
1007 | +# define G_GOFFSET_FORMAT G_GINT64_FORMAT | |
1008 | +#endif /* not G_GOFFSET_FORMAT */ | |
1009 | +#ifndef G_GINTPTR_MODIFIER | |
1010 | +# define G_GINTPTR_MODIFIER "l" | |
1011 | +#endif /* not G_GINTPTR_MODIFIER */ | |
1012 | +#ifndef G_GINTPTR_FORMAT | |
1013 | +# define G_GINTPTR_FORMAT "li" | |
1014 | +#endif /* not G_GINTPTR_FORMAT */ | |
1015 | +#ifndef G_GUINTPTR_FORMAT | |
1016 | +# define G_GUINTPTR_FORMAT "lu" | |
1017 | +#endif /* not G_GUINTPTR_FORMAT */ | |
1018 | + | |
1019 | + | |
1020 | +/****************************************************************************** | |
1021 | +* String Utility Functions * | |
1022 | +******************************************************************************/ | |
1023 | +#if GLIB_CHECK_VERSION(2,2,0) | |
1024 | +# include <glib/gprintf.h> | |
1025 | +#else /* not GLIB_CHECK_VERSION(2,2,0) */ | |
1026 | +gboolean g_str_has_prefix (const gchar *str, const gchar *prefix); | |
1027 | +gboolean g_str_has_suffix (const gchar *str, const gchar *suffix); | |
1028 | +# define g_printf printf | |
1029 | +# define g_vprintf vprintf | |
1030 | +# define g_fprintf fprintf | |
1031 | +# define g_vfprintf vfprintf | |
1032 | +# define g_sprintf sprintf | |
1033 | +# define g_vsprintf vsprintf | |
1034 | +# ifdef HAVE_VASPRINTF | |
1035 | +# define g_vasprintf vasprintf | |
1036 | +# else /* not HAVE_VASPRINTF */ | |
1037 | +gint g_vasprintf (gchar **string, gchar const *format, va_list args); | |
1038 | +# endif /* not HAVE_VASPRINTF */ | |
1039 | +# define g_ascii_strtoull strtoul | |
1040 | +#endif /* not GLIB_CHECK_VERSION(2,2,0) */ | |
1041 | +#if ! GLIB_CHECK_VERSION(2,12,0) | |
1042 | +# define g_ascii_strtoll strtol | |
1043 | +#endif /* not GLIB_CHECK_VERSION(2,12,0) */ | |
1044 | + | |
1045 | + | |
1046 | +/****************************************************************************** | |
1047 | +* Internationalization * | |
1048 | +******************************************************************************/ | |
1049 | +#if GLIB_CHECK_VERSION(2,4,0) | |
1050 | +# include <glib/gi18n.h> | |
1051 | +#else /* not GLIB_CHECK_VERSION(2,4,0) */ | |
1052 | +# ifdef ENABLE_NLS | |
1053 | +# include <libintl.h> | |
1054 | +# define _(String) dgettext(PACKAGE,String) | |
1055 | +# ifdef gettext_noop | |
1056 | +# define N_(String) gettext_noop(String) | |
1057 | +# else /* not gettext_noop */ | |
1058 | +# define N_(String) (String) | |
1059 | +# endif /* not gettext_noop */ | |
1060 | +# define Q_(String) g_strip_context((String),gettext(String)) | |
1061 | +# else /* not ENABLE_NLS */ | |
1062 | +# define _(String) (String) | |
1063 | +# define N_(String) (String) | |
1064 | +# define Q_(String) (String) | |
1065 | +# define textdomain(String) (String) | |
1066 | +# define gettext(String) (String) | |
1067 | +# define dgettext(Domain,String) (String) | |
1068 | +# define dcgettext(Domain,String,Type) (String) | |
1069 | +# define bindtextdomain(Domain,Directory) (Domain) | |
1070 | +# endif /* not ENABLE_NLS */ | |
1071 | +#endif /* not GLIB_CHECK_VERSION(2,4,0) */ | |
1072 | + | |
1073 | + | |
1074 | +/****************************************************************************** | |
1075 | +* File Utilities * | |
1076 | +******************************************************************************/ | |
1077 | +#if GLIB_CHECK_VERSION(2,6,0) | |
1078 | +# include <glib/gstdio.h> | |
1079 | +#else /* not GLIB_CHECK_VERSION(2,6,0) */ | |
1080 | +# define g_open open | |
1081 | +# define g_rename rename | |
1082 | +# define g_mkdir mkdir | |
1083 | +# define g_stat stat | |
1084 | +# define g_lstat lstat | |
1085 | +# define g_unlink unlink | |
1086 | +# define g_remove remove | |
1087 | +# define g_rmdir rmdir | |
1088 | +# define g_fopen fopen | |
1089 | +# define g_freopen freopen | |
1090 | +#endif /* not GLIB_CHECK_VERSION(2,6,0) */ | |
1091 | +#if ! GLIB_CHECK_VERSION(2,8,0) | |
1092 | +# define g_chmod chmod | |
1093 | +# define g_access access | |
1094 | +# define g_creat creat | |
1095 | +# define g_chdir chdir | |
1096 | +#endif /* not GLIB_CHECK_VERSION(2,8,0) */ | |
1097 | +#if ! GLIB_CHECK_VERSION(2,18,0) | |
1098 | +# define g_utime utime | |
1099 | +#endif /* not GLIB_CHECK_VERSION(2,18,0) */ | |
1100 | +#if ! GLIB_CHECK_VERSION(2,22,0) | |
1101 | +# define g_mapped_file_unref g_mapped_file_free | |
1102 | +#endif /* not GLIB_CHECK_VERSION(2,22,0) */ | |
1103 | + | |
1104 | + | |
1105 | +/****************************************************************************** | |
1106 | +* Key-value file parser * | |
1107 | +******************************************************************************/ | |
1108 | +#include "profile.h" | |
1109 | + | |
1110 | + | |
1111 | +/****************************************************************************** | |
1112 | +* Windows Compatibility Functions * | |
1113 | +******************************************************************************/ | |
1114 | +#ifdef G_OS_WIN32 | |
1115 | +# ifndef MAXPATHLEN | |
1116 | +# define MAXPATHLEN 1024 | |
1117 | +# endif /* not MAXPATHLEN */ | |
1118 | +# ifndef G_WIN32_HAVE_WIDECHAR_API | |
1119 | +# define G_WIN32_HAVE_WIDECHAR_API() TRUE | |
1120 | +# endif /* not G_WIN32_HAVE_WIDECHAR_API */ | |
1121 | +# ifndef G_WIN32_IS_NT_BASED | |
1122 | +# define G_WIN32_IS_NT_BASED() TRUE | |
1123 | +# endif /* not G_WIN32_IS_NT_BASED */ | |
1124 | +#endif /* G_OS_WIN32 */ | |
1125 | + | |
1126 | + | |
1127 | +/****************************************************************************** | |
1128 | +* Quarks * | |
1129 | +******************************************************************************/ | |
1130 | +#if ! GLIB_CHECK_VERSION(2,10,0) | |
1131 | +# define g_intern_string(s) (s) | |
1132 | +# define g_intern_static_string(s) (s) | |
1133 | +#endif /* not GLIB_CHECK_VERSION(2,10,0) */ | |
1134 | + | |
1135 | + | |
1136 | +/****************************************************************************** | |
1137 | +* Type Information * | |
1138 | +******************************************************************************/ | |
1139 | +#ifndef G_DEFINE_TYPE | |
1140 | +# define G_DEFINE_TYPE(TypeName,type_name,TYPE_PARENT) G_DEFINE_TYPE_EXTENDED(TypeName,type_name,TYPE_PARENT,0,{}) | |
1141 | +#endif /* not G_DEFINE_TYPE */ | |
1142 | +#ifndef G_DEFINE_TYPE_WITH_CODE | |
1143 | +# define G_DEFINE_TYPE_WITH_CODE(TypeName,type_name,TYPE_PARENT,CODE) _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName,type_name,TYPE_PARENT,0) {CODE;} _G_DEFINE_TYPE_EXTENDED_END() | |
1144 | +#endif /* not G_DEFINE_TYPE_WITH_CODE */ | |
1145 | +#ifndef G_DEFINE_ABSTRACT_TYPE | |
1146 | +# define G_DEFINE_ABSTRACT_TYPE(TypeName,type_name,TYPE_PARENT) G_DEFINE_TYPE_EXTENDED(TypeName,type_name,TYPE_PARENT,G_TYPE_FLAG_ABSTRACT,{}) | |
1147 | +#endif /* not G_DEFINE_ABSTRACT_TYPE */ | |
1148 | +#ifndef G_DEFINE_ABSTRACT_TYPE_WITH_CODE | |
1149 | +# define G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TypeName,type_name,TYPE_PARENT,CODE) _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName,type_name,TYPE_PARENT,G_TYPE_FLAG_ABSTRACT) {CODE;} _G_DEFINE_TYPE_EXTENDED_END() | |
1150 | +#endif /* not G_DEFINE_ABSTRACT_TYPE_WITH_CODE */ | |
1151 | +#ifndef G_DEFINE_TYPE_EXTENDED | |
1152 | +# define G_DEFINE_TYPE_EXTENDED(TypeName,type_name,TYPE_PARENT,flags,CODE) _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName,type_name,TYPE_PARENT,flags) {CODE;} _G_DEFINE_TYPE_EXTENDED_END() | |
1153 | +#endif /* not G_DEFINE_TYPE_EXTENDED */ | |
1154 | +#ifndef G_IMPLEMENT_INTERFACE | |
1155 | +# define G_IMPLEMENT_INTERFACE(TYPE_IFACE,iface_init) | |
1156 | + { \ | |
1157 | + const GInterfaceInfo g_implement_interface_info = { \ | |
1158 | + (GInterfaceInitFunc) iface_init, NULL, NULL \ | |
1159 | + }; \ | |
1160 | + g_type_add_interface_static (g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \ | |
1161 | + } | |
1162 | +#endif /* not G_IMPLEMENT_INTERFACE */ | |
1163 | +#ifndef _G_DEFINE_TYPE_EXTENDED_BEGIN | |
1164 | +# define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName,type_name,TYPE_PARENT,flags) \ | |
1165 | + \ | |
1166 | +static void type_name##_init (TypeName *self); \ | |
1167 | +static void type_name##_class_init (TypeName##Class *klass); \ | |
1168 | +static gpointer type_name##_parent_class = NULL; \ | |
1169 | +static void type_name##_class_intern_init (gpointer klass) \ | |
1170 | +{ \ | |
1171 | + type_name##_parent_class = g_type_class_peek_parent (klass); \ | |
1172 | + type_name##_class_init ((TypeName##Class*) klass); \ | |
1173 | +} \ | |
1174 | + \ | |
1175 | +GType \ | |
1176 | +type_name##_get_type (void) \ | |
1177 | +{ \ | |
1178 | + static GType g_define_type_id = 0; \ | |
1179 | + if (G_UNLIKELY (g_define_type_id == 0)) \ | |
1180 | + { \ | |
1181 | + static const GTypeInfo g_define_type_info = { \ | |
1182 | + sizeof (TypeName##Class), \ | |
1183 | + NULL, \ | |
1184 | + NULL, \ | |
1185 | + (GClassInitFunc) type_name##_class_intern_init, \ | |
1186 | + NULL, \ | |
1187 | + NULL, \ | |
1188 | + sizeof (TypeName), \ | |
1189 | + 0, \ | |
1190 | + (GInstanceInitFunc) type_name##_init, \ | |
1191 | + NULL \ | |
1192 | + }; \ | |
1193 | + \ | |
1194 | + g_define_type_id = g_type_register_static (TYPE_PARENT, \ | |
1195 | + g_intern_static_string (#TypeName), \ | |
1196 | + &g_define_type_info, \ | |
1197 | + (GTypeFlags)flags); \ | |
1198 | + { | |
1199 | +#endif /* not _G_DEFINE_TYPE_EXTENDED_BEGIN */ | |
1200 | +#ifndef _G_DEFINE_TYPE_EXTENDED_END | |
1201 | +# define _G_DEFINE_TYPE_EXTENDED_END() \ | |
1202 | + } \ | |
1203 | + } \ | |
1204 | + return g_define_type_id; \ | |
1205 | +} | |
1206 | +#endif /* not _G_DEFINE_TYPE_EXTENDED_END */ | |
1207 | + | |
1208 | + | |
1209 | +/****************************************************************************** | |
1210 | +* Extended * | |
1211 | +******************************************************************************/ | |
1212 | +gchar *g_strcpy (gchar *dest, const gchar *src); | |
1213 | +gchar *g_strncpy (gchar *dest, const gchar *src, const gsize n); | |
1214 | +gchar *g_strcat (gchar *dest, const gchar *src); | |
1215 | +gchar *g_strncat (gchar *dest, const gchar *src, const gsize n); | |
1216 | +#if GLIB_CHECK_VERSION(2,16,0) | |
1217 | +# define g_strcmp g_strcmp0 | |
1218 | +#else /* not GLIB_CHECK_VERSION(2,16,0) */ | |
1219 | +# define g_strcmp0 g_strcmp | |
1220 | +gint g_strcmp (const gchar *s1, const gchar *s2) | |
1221 | +#endif /* not GLIB_CHECK_VERSION(2,16,0) */ | |
1222 | +gint g_strncmp (const gchar *s1, const gchar *s2, const gsize n); | |
1223 | +gchar *g_strchr (const gchar *s, const gint c); | |
1224 | +gchar *g_strrchr (const gchar *s, const gint c); | |
1225 | +gsize g_strspn (const gchar *s, const gchar *accept); | |
1226 | +gsize g_strcspn (const gchar *s, const gchar *reject); | |
1227 | +gchar *g_strpbrk (const gchar *s, const gchar *accept); | |
1228 | +gchar *g_strstr (const gchar *haystack, const gchar *needle); | |
1229 | +gsize g_strlen (const gchar *s); | |
1230 | +gchar *g_strtok (gchar *str, const gchar *delim); | |
1231 | +gint g_memcmp (gconstpointer s1, gconstpointer s2, const gsize n); | |
1232 | +gpointer g_memchr (gconstpointer s, const gint c, const gsize n); | |
1233 | +gpointer g_memset (gpointer s, const gint c, const gsize n); | |
1234 | +#ifdef HAVE_ASPRINTF | |
1235 | +# define g_asprintf asprintf | |
1236 | +#else /* not HAVE_ASPRINTF */ | |
1237 | +gint g_asprintf (gchar **string, gchar const *format, ...); | |
1238 | +#endif /* not HAVE_ASPRINTF */ | |
1239 | +#ifdef G_OS_WIN32 | |
1240 | +# define g_strfilecmp g_ascii_strcasecmp | |
1241 | +# define g_strfilencmp g_ascii_strncasecmp | |
1242 | +#else /* not G_OS_WIN32 */ | |
1243 | +# define g_strfilecmp g_strcmp | |
1244 | +# define g_strfilencmp g_strncmp | |
1245 | +#endif /* not G_OS_WIN32 */ | |
1246 | + | |
1247 | + | |
1248 | +#ifndef SPACING | |
1249 | +# define SPACING 5 | |
1250 | +#endif /* not SPACING */ | |
1251 | +#if defined (USE_THREAD) && ! defined (G_THREADS_ENABLED) | |
1252 | +# undef USE_THREAD | |
1253 | +#endif /* defined (USE_THREAD) && ! defined (G_THREADS_ENABLED) */ | |
1254 | + | |
1255 | + | |
1256 | +#ifdef _MSC_VER | |
1257 | +# pragma warning (disable:4068) | |
1258 | +# pragma warning (disable:4819) | |
1259 | +#endif /* _MSC_VER */ | |
1260 | + | |
1261 | + | |
1262 | +#endif /* __GCOMMON_H__ */ |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | fileio |
3 | - copyright (c) 1998-2009 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -16,7 +16,6 @@ | ||
16 | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | 17 | */ |
18 | 18 | #include "fileio.h" |
19 | -#include <time.h> | |
20 | 19 | #ifdef HAVE_UTIME_H |
21 | 20 | # include <utime.h> |
22 | 21 | #endif /* HAVE_UTIME_H */ |
@@ -23,9 +22,6 @@ | ||
23 | 22 | #if defined (TM_IN_SYS_TIME) && defined (HAVE_SYS_TIME_H) |
24 | 23 | # include <sys/time.h> |
25 | 24 | #endif /* defined (TM_IN_SYS_TIME) && defined (HAVE_SYS_TIME_H) */ |
26 | -#if GLIB_CHECK_VERSION(2,6,0) | |
27 | -# include <glib/gstdio.h> | |
28 | -#endif /* GLIB_CHECK_VERSION(2,6,0) */ | |
29 | 25 | #if defined (G_OS_WIN32) |
30 | 26 | # include <shlwapi.h> |
31 | 27 | #elif GLIB_CHECK_VERSION(2,16,0) |
@@ -628,7 +624,7 @@ | ||
628 | 624 | return NULL; |
629 | 625 | } |
630 | 626 | |
631 | - fd = open (path, flags, | |
627 | + fd = g_open (path, flags, | |
632 | 628 | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); |
633 | 629 | if (fd == -1) |
634 | 630 | { |
@@ -1153,13 +1149,8 @@ | ||
1153 | 1149 | } |
1154 | 1150 | # endif /* GLIB_CHECK_VERSION(2,6,0) */ |
1155 | 1151 | #else /* not G_OS_WIN32 */ |
1156 | -# if GLIB_CHECK_VERSION(2,6,0) | |
1157 | 1152 | result = g_mkdir (path, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP |
1158 | 1153 | | S_IROTH | S_IXOTH) == 0; |
1159 | -# else /* not GLIB_CHECK_VERSION(2,6,0) */ | |
1160 | - result = mkdir (path, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | |
1161 | - | S_IROTH | S_IXOTH) == 0; | |
1162 | -# endif /* not GLIB_CHECK_VERSION(2,6,0) */ | |
1163 | 1154 | #endif /* not G_OS_WIN32 */ |
1164 | 1155 | g_free (path); |
1165 | 1156 | return result; |
@@ -1236,11 +1227,7 @@ | ||
1236 | 1227 | } |
1237 | 1228 | # endif /* GLIB_CHECK_VERSION(2,6,0) */ |
1238 | 1229 | #else /* not G_OS_WIN32 */ |
1239 | -# if GLIB_CHECK_VERSION(2,6,0) | |
1240 | 1230 | result = g_rmdir (path) == 0; |
1241 | -# else /* not GLIB_CHECK_VERSION(2,6,0) */ | |
1242 | - result = rmdir (path) == 0; | |
1243 | -# endif /* not GLIB_CHECK_VERSION(2,6,0) */ | |
1244 | 1231 | #endif /* not G_OS_WIN32 */ |
1245 | 1232 | } |
1246 | 1233 | } |
@@ -1289,11 +1276,7 @@ | ||
1289 | 1276 | } |
1290 | 1277 | # endif /* GLIB_CHECK_VERSION(2,6,0) */ |
1291 | 1278 | #else /* not G_OS_WIN32 */ |
1292 | -# if GLIB_CHECK_VERSION(2,6,0) | |
1293 | 1279 | result = g_remove (path) == 0; |
1294 | -# else /* not GLIB_CHECK_VERSION(2,6,0) */ | |
1295 | - result = remove (path) == 0; | |
1296 | -# endif /* not GLIB_CHECK_VERSION(2,6,0) */ | |
1297 | 1280 | #endif /* not G_OS_WIN32 */ |
1298 | 1281 | } |
1299 | 1282 | return result; |
@@ -1387,7 +1370,7 @@ | ||
1387 | 1370 | } |
1388 | 1371 | # endif /* GLIB_CHECK_VERSION(2,6,0) */ |
1389 | 1372 | #else /* not G_OS_WIN32 */ |
1390 | - if (stat (file, &buf)) | |
1373 | + if (g_stat (file, &buf)) | |
1391 | 1374 | return FALSE; |
1392 | 1375 | if (atime) |
1393 | 1376 | *atime = buf.st_atime; |
@@ -1475,7 +1458,7 @@ | ||
1475 | 1458 | return CloseHandle (hFile); |
1476 | 1459 | #else /* not G_OS_WIN32 */ |
1477 | 1460 | # ifdef HAVE_UTIME |
1478 | - if (stat (file, &sbuf)) | |
1461 | + if (g_stat (file, &sbuf)) | |
1479 | 1462 | return FALSE; |
1480 | 1463 | ubuf.actime = atime ? *atime : sbuf.st_atime; |
1481 | 1464 | ubuf.modtime = mtime ? *mtime : sbuf.st_mtime; |
@@ -4,6 +4,7 @@ | ||
4 | 4 | argument.c argument.h \ |
5 | 5 | bitmap.c bitmap.h \ |
6 | 6 | fileio.c fileio.h \ |
7 | + gcommon.c gcommon.h \ | |
7 | 8 | gnugpl.c gnugpl.h \ |
8 | 9 | license.c license.h \ |
9 | 10 | misc.c misc.h \ |
@@ -15,19 +16,18 @@ | ||
15 | 16 | winmain.c |
16 | 17 | |
17 | 18 | if ENABLE_MIME |
18 | -AM_CPPFLAGS := $(AM_CPPFLAGS) \ | |
19 | +AM_CPPFLAGS = \ | |
19 | 20 | -DLOCALEDIR=\""$(localedir)"\" \ |
20 | 21 | -DSYSCONFDIR=\""$(sysconfdir)"\" \ |
21 | 22 | -DMIMEFILE=\""$(mimefile)"\" |
22 | 23 | else |
23 | -AM_CPPFLAGS := $(AM_CPPFLAGS) \ | |
24 | +AM_CPPFLAGS = \ | |
24 | 25 | -DLOCALEDIR=\""$(localedir)"\" \ |
25 | 26 | -DSYSCONFDIR=\""$(sysconfdir)"\" |
26 | 27 | endif |
27 | 28 | |
28 | 29 | INCLUDES = \ |
29 | - $(GTK_CFLAGS) \ | |
30 | - -I$(top_srcdir) | |
30 | + $(GTK_CFLAGS) | |
31 | 31 | |
32 | 32 | libmisc_la_LIBADD = \ |
33 | 33 | $(GTK_LIBS) |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | w32loader |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -19,7 +19,7 @@ | ||
19 | 19 | #define __W32LDR_FONT_H__ |
20 | 20 | |
21 | 21 | |
22 | -#include "gcommon.h" | |
22 | +#include "misc/gcommon.h" | |
23 | 23 | |
24 | 24 | |
25 | 25 | G_BEGIN_DECLS |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | w32loader |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -19,7 +19,7 @@ | ||
19 | 19 | #define __WINDEF_H__ |
20 | 20 | |
21 | 21 | |
22 | -#include "gcommon.h" | |
22 | +#include "misc/gcommon.h" | |
23 | 23 | |
24 | 24 | |
25 | 25 | G_BEGIN_DECLS |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | w32loader |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -19,7 +19,7 @@ | ||
19 | 19 | #define __W32LDR_BRUSH_H__ |
20 | 20 | |
21 | 21 | |
22 | -#include "gcommon.h" | |
22 | +#include "misc/gcommon.h" | |
23 | 23 | |
24 | 24 | |
25 | 25 | G_BEGIN_DECLS |
@@ -7482,7 +7482,7 @@ | ||
7482 | 7482 | |
7483 | 7483 | |
7484 | 7484 | /* __isascii ordinal = 1067, argument = 0 temporary */ |
7485 | -static DWORD WINAPI __isascii (VOID) | |
7485 | +static DWORD WINAPI ntdll___isascii (VOID) | |
7486 | 7486 | { |
7487 | 7487 | return 0; |
7488 | 7488 | } |
@@ -7503,7 +7503,7 @@ | ||
7503 | 7503 | |
7504 | 7504 | |
7505 | 7505 | /* __toascii ordinal = 1070, argument = 0 temporary */ |
7506 | -static DWORD WINAPI __toascii (VOID) | |
7506 | +static DWORD WINAPI ntdll___toascii (VOID) | |
7507 | 7507 | { |
7508 | 7508 | return 0; |
7509 | 7509 | } |
@@ -7712,15 +7712,15 @@ | ||
7712 | 7712 | } |
7713 | 7713 | |
7714 | 7714 | |
7715 | -/* _tolower ordinal = 1100, argument = 0 temporary */ | |
7716 | -static DWORD WINAPI _tolower (VOID) | |
7715 | +/* tolower ordinal = 1100, argument = 0 temporary */ | |
7716 | +static DWORD WINAPI ntdll__tolower (VOID) | |
7717 | 7717 | { |
7718 | 7718 | return 0; |
7719 | 7719 | } |
7720 | 7720 | |
7721 | 7721 | |
7722 | -/* _toupper ordinal = 1101, argument = 0 temporary */ | |
7723 | -static DWORD WINAPI _toupper (VOID) | |
7722 | +/* toupper ordinal = 1101, argument = 0 temporary */ | |
7723 | +static DWORD WINAPI ntdll__toupper (VOID) | |
7724 | 7724 | { |
7725 | 7725 | return 0; |
7726 | 7726 | } |
@@ -9409,10 +9409,10 @@ | ||
9409 | 9409 | {-1, 1064, "__eFYL2X", __eFYL2X}, |
9410 | 9410 | {-1, 1065, "__eFYL2XP1", __eFYL2XP1}, |
9411 | 9411 | {-1, 1066, "__eGetStatusWord", __eGetStatusWord}, |
9412 | -{-1, 1067, "__isascii", __isascii}, | |
9412 | +{-1, 1067, "__isascii", ntdll___isascii}, | |
9413 | 9413 | {-1, 1068, "__iscsym", __iscsym}, |
9414 | 9414 | {-1, 1069, "__iscsymf", __iscsymf}, |
9415 | -{-1, 1070, "__toascii", __toascii}, | |
9415 | +{-1, 1070, "__toascii", ntdll___toascii}, | |
9416 | 9416 | {-1, 1071, "_alldiv", _alldiv}, |
9417 | 9417 | {-1, 1072, "_allmul", _allmul}, |
9418 | 9418 | {-1, 1073, "_alloca_probe", _alloca_probe}, |
@@ -9442,8 +9442,8 @@ | ||
9442 | 9442 | {-1, 1097, "_strlwr", _strlwr}, |
9443 | 9443 | {-1, 1098, "_strnicmp", _strnicmp}, |
9444 | 9444 | {-1, 1099, "_strupr", _strupr}, |
9445 | -{-1, 1100, "_tolower", _tolower}, | |
9446 | -{-1, 1101, "_toupper", _toupper}, | |
9445 | +{-1, 1100, "_tolower", ntdll__tolower}, | |
9446 | +{-1, 1101, "_toupper", ntdll__toupper}, | |
9447 | 9447 | {-1, 1102, "_ui64toa", _ui64toa}, |
9448 | 9448 | {-1, 1103, "_ultoa", _ultoa}, |
9449 | 9449 | {-1, 1104, "_ultow", _ultow}, |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | w32loader |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -19,7 +19,7 @@ | ||
19 | 19 | #define __W32LDR_PEN_H__ |
20 | 20 | |
21 | 21 | |
22 | -#include "gcommon.h" | |
22 | +#include "misc/gcommon.h" | |
23 | 23 | |
24 | 24 | |
25 | 25 | G_BEGIN_DECLS |
@@ -40,7 +40,7 @@ | ||
40 | 40 | winsock.c winsock.h \ |
41 | 41 | afxres.h direct.h mbstring.h process.h shlobj.h vfw.h windowsx.h |
42 | 42 | |
43 | -AM_CPPFLAGS := $(AM_CPPFLAGS) \ | |
43 | +AM_CPPFLAGS = \ | |
44 | 44 | -DBINDIR=\""$(bindir)"\" \ |
45 | 45 | -DLIBDIR=\""$(libdir)"\" \ |
46 | 46 | -DSYSCONFDIR=\""$(sysconfdir)"\" |
@@ -13,7 +13,7 @@ | ||
13 | 13 | CLFLAGS=/c /D_MBCS /DNDEBUG /DWIN32 /D_WINDOWS /D_WIN32_WINNT=0x0500 /DWINVER=0x0500 /D_CRT_SECURE_NO_DEPRECATE /Fo$@ /MD /nologo /O2 /Zm400 |
14 | 14 | LNFLAGS=/INCREMENTAL:NO /MACHINE:IX86 /NOLOGO /OUT:$@ /RELEASE /SUBSYSTEM:WINDOWS |
15 | 15 | RCFLAGS=/c1252 /d_MBCS /dNDEBUG /dWIN32 /d_WINDOWS /d_WIN32_WINNT=0x0500 /dWINVER=0x0500 /fo$@ /l0 |
16 | -DEFINES=/DPACKAGE=\"vmaid\" /DVERSION=\"$(VERSION)\" /DBUILD_ENVIRONMENT=\"Windows\" /DENABLE_NLS=1 /DHAVE_FCNTL_H=1 /DHAVE_SYS_STAT_H=1 /DHAVE_SYS_TYPES_H=1 /DSTDC_HEADERS=1 /DUSE_THREAD=1 | |
16 | +DEFINES=/DPACKAGE=\"vmaid\" /DVERSION=\"$(VERSION)\" /DBUILD_ENVIRONMENT=\"Windows\" /DENABLE_NLS=1 /DHAVE_FCNTL_H=1 /DHAVE_SYS_STAT_H=1 /DHAVE_SYS_TYPES_H=1 /DUSE_GTK=1 /DUSE_THREAD=1 | |
17 | 17 | INCLUDES=/I$(TOP) |
18 | 18 | |
19 | 19 | all: avicore misc orz src locale\ja\LC_MESSAGES\vmaid.mo vmaid.exe |
@@ -36,163 +36,169 @@ | ||
36 | 36 | if not exist locale\ja\LC_MESSAGES mkdir locale\ja\LC_MESSAGES |
37 | 37 | msgfmt $** -o $@ |
38 | 38 | |
39 | -vmaid.exe: avicore\acm.obj avicore\avibase.obj avicore\aviclip.obj avicore\avicore.obj avicore\aviedit.obj avicore\aviextra.obj avicore\avifile.obj avicore\aviframe.obj avicore\avilang.obj avicore\avimemory.obj avicore\aviopen.obj avicore\avipcm.obj avicore\aviplay.obj avicore\avisave.obj avicore\avitext.obj avicore\chunk.obj avicore\icm.obj avicore\wave.obj misc\argument.obj misc\bitmap.obj misc\fileio.obj misc\gnugpl.obj misc\license.obj misc\misc.obj misc\pixbuf.obj misc\profile.obj misc\winmain.obj orz\orzaccel.obj orz\orzcomm.obj orz\orzhistory.obj orz\orzmdi.obj orz\orzpref.obj orz\orzwinmenu.obj src\change.obj src\codec.obj src\command.obj src\file.obj src\general.obj src\icons.obj src\jump.obj src\keyfile.obj src\menu.obj src\merge.obj src\preview.obj src\prop.obj src\sigfile.obj src\sigmain.obj src\size.obj src\thread.obj src\version.obj src\vmaid.obj src\vmaid.res | |
39 | +vmaid.exe: avicore\acm.obj avicore\avibase.obj avicore\aviclip.obj avicore\avicore.obj avicore\aviedit.obj avicore\aviextra.obj avicore\avifile.obj avicore\aviframe.obj avicore\avilang.obj avicore\avimemory.obj avicore\aviopen.obj avicore\avipcm.obj avicore\aviplay.obj avicore\avisave.obj avicore\avitext.obj avicore\chunk.obj avicore\icm.obj avicore\wave.obj misc\argument.obj misc\bitmap.obj misc\fileio.obj misc\gcommon.obj misc\gnugpl.obj misc\license.obj misc\misc.obj misc\peimage.obj misc\pixbuf.obj misc\profile.obj misc\winmain.obj orz\orzaccel.obj orz\orzcomm.obj orz\orzhistory.obj orz\orzmdi.obj orz\orzpref.obj orz\orzwinmenu.obj src\change.obj src\codec.obj src\command.obj src\file.obj src\general.obj src\icons.obj src\jump.obj src\keyfile.obj src\menu.obj src\merge.obj src\preview.obj src\prop.obj src\sigfile.obj src\sigmain.obj src\size.obj src\thread.obj src\version.obj src\vmaid.obj src\vmaid.res | |
40 | 40 | $(LINK) $(LNFLAGS) gdk_pixbuf-2.0.lib gdk-win32-2.0.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gtk-win32-2.0.lib intl.lib pango-1.0.lib advapi32.lib gdi32.lib ole32.lib shell32.lib shlwapi.lib user32.lib winmm.lib $** |
41 | 41 | if exist $@.manifest $(MT) -manifest $@.manifest -outputresource:$@ |
42 | 42 | |
43 | -avicore\acm.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\wave.h | |
43 | +avicore\acm.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\wave.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
44 | 44 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
45 | 45 | |
46 | -avicore\avibase.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h | |
46 | +avicore\avibase.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\acm.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
47 | 47 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
48 | 48 | |
49 | -avicore\aviclip.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\pixbuf.h | |
49 | +avicore\aviclip.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\pixbuf.h $(TOP)\misc\profile.h | |
50 | 50 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
51 | 51 | |
52 | -avicore\avicore.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h | |
52 | +avicore\avicore.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
53 | 53 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
54 | 54 | |
55 | -avicore\aviedit.obj: $(TOP)\$*.c $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h | |
55 | +avicore\aviedit.obj: $(TOP)\$*.c $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
56 | 56 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
57 | 57 | |
58 | -avicore\aviextra.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h | |
58 | +avicore\aviextra.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
59 | 59 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
60 | 60 | |
61 | -avicore\avifile.obj: $(TOP)\$*.c $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\avifmt.h $(TOP)\avicore\chunk.h $(TOP)\avicore\gsrfmt.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\pixbuf.h | |
61 | +avicore\avifile.obj: $(TOP)\$*.c $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\avifmt.h $(TOP)\avicore\chunk.h $(TOP)\avicore\gsrfmt.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\pixbuf.h $(TOP)\misc\profile.h | |
62 | 62 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
63 | 63 | |
64 | -avicore\aviframe.obj: $(TOP)\$*.c $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\avifmt.h $(TOP)\avicore\chunk.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h | |
64 | +avicore\aviframe.obj: $(TOP)\$*.c $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\avifmt.h $(TOP)\avicore\chunk.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
65 | 65 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
66 | 66 | |
67 | -avicore\avilang.obj: $(TOP)\$*.c $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h | |
67 | +avicore\avilang.obj: $(TOP)\$*.c $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
68 | 68 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
69 | 69 | |
70 | -avicore\avimemory.obj: $(TOP)\$*.c $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h | |
70 | +avicore\avimemory.obj: $(TOP)\$*.c $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
71 | 71 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
72 | 72 | |
73 | -avicore\aviopen.obj: $(TOP)\$*.c $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\avifmt.h $(TOP)\avicore\chunk.h $(TOP)\avicore\gsrfmt.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\pixbuf.h | |
73 | +avicore\aviopen.obj: $(TOP)\$*.c $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\avifmt.h $(TOP)\avicore\chunk.h $(TOP)\avicore\gsrfmt.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\pixbuf.h $(TOP)\misc\profile.h | |
74 | 74 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
75 | 75 | |
76 | -avicore\avipcm.obj: $(TOP)\$*.c $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h | |
76 | +avicore\avipcm.obj: $(TOP)\$*.c $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
77 | 77 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
78 | 78 | |
79 | -avicore\aviplay.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h | |
79 | +avicore\aviplay.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
80 | 80 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
81 | 81 | |
82 | -avicore\avisave.obj: $(TOP)\$*.c $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\avifmt.h $(TOP)\avicore\chunk.h $(TOP)\avicore\gsrfmt.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\pixbuf.h | |
82 | +avicore\avisave.obj: $(TOP)\$*.c $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\avifmt.h $(TOP)\avicore\chunk.h $(TOP)\avicore\gsrfmt.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\pixbuf.h $(TOP)\misc\profile.h | |
83 | 83 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
84 | 84 | |
85 | -avicore\avitext.obj: $(TOP)\$*.c $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\avifmt.h $(TOP)\avicore\chunk.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\misc.h | |
85 | +avicore\avitext.obj: $(TOP)\$*.c $(TOP)\avicore\acm.h $(TOP)\avicore\avibase.h $(TOP)\avicore\avicore.h $(TOP)\avicore\avifmt.h $(TOP)\avicore\chunk.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h | |
86 | 86 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
87 | 87 | |
88 | -avicore\chunk.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\misc\fileio.h | |
88 | +avicore\chunk.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
89 | 89 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
90 | 90 | |
91 | -avicore\icm.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\chunk.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h | |
91 | +avicore\icm.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\chunk.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
92 | 92 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
93 | 93 | |
94 | -avicore\wave.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h | |
94 | +avicore\wave.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
95 | 95 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
96 | 96 | |
97 | -misc\argument.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\misc\misc.h | |
97 | +misc\argument.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h | |
98 | 98 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
99 | 99 | |
100 | -misc\bitmap.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h | |
100 | +misc\bitmap.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
101 | 101 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
102 | 102 | |
103 | -misc\fileio.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h | |
103 | +misc\fileio.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
104 | 104 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
105 | 105 | |
106 | -misc\gnugpl.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h | |
106 | +misc\gcommon.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\profile.h | |
107 | 107 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
108 | 108 | |
109 | -misc\license.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\misc\misc.h | |
109 | +misc\gnugpl.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
110 | 110 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
111 | 111 | |
112 | -misc\misc.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\misc\fileio.h | |
112 | +misc\license.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h | |
113 | 113 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
114 | 114 | |
115 | -misc\pixbuf.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\misc\bitmap.h | |
115 | +misc\misc.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
116 | 116 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
117 | 117 | |
118 | -misc\profile.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\misc\fileio.h $(TOP)\misc\misc.h | |
118 | +misc\peimage.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
119 | 119 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
120 | 120 | |
121 | -misc\winmain.obj: $(TOP)\$*.c $(TOP)\gcommon.h | |
121 | +misc\pixbuf.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
122 | 122 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
123 | 123 | |
124 | -orz\orzaccel.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h | |
124 | +misc\profile.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h | |
125 | 125 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
126 | 126 | |
127 | -orz\orzcomm.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\misc\fileio.h | |
127 | +misc\winmain.obj: $(TOP)\$*.c $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
128 | 128 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
129 | 129 | |
130 | -orz\orzhistory.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\misc\fileio.h | |
130 | +orz\orzaccel.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
131 | 131 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
132 | 132 | |
133 | -orz\orzmdi.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\misc\fileio.h $(TOP)\misc\misc.h | |
133 | +orz\orzcomm.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
134 | 134 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
135 | 135 | |
136 | -orz\orzpref.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\misc\misc.h $(TOP)\orz\orzhistory.h | |
136 | +orz\orzhistory.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h | |
137 | 137 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
138 | 138 | |
139 | -orz\orzwinmenu.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\orz\orzmdi.h | |
139 | +orz\orzmdi.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h | |
140 | 140 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
141 | 141 | |
142 | -src\change.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\misc.h $(TOP)\src\size.h $(TOP)\src\thread.h $(TOP)\src\vmaid.h | |
142 | +orz\orzpref.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\orz\orzhistory.h | |
143 | 143 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
144 | 144 | |
145 | -src\codec.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\misc.h $(TOP)\src\vmaid.h | |
145 | +orz\orzwinmenu.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h $(TOP)\orz\orzmdi.h | |
146 | 146 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
147 | 147 | |
148 | -src\command.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\aviclip.h $(TOP)\avicore\avicore.h $(TOP)\avicore\aviextra.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\misc.h $(TOP)\orz\orzhistory.h $(TOP)\orz\orzmdi.h $(TOP)\orz\orzpref.h $(TOP)\src\change.h $(TOP)\src\codec.h $(TOP)\src\file.h $(TOP)\src\general.h $(TOP)\src\jump.h $(TOP)\src\menu.h $(TOP)\src\merge.h $(TOP)\src\preview.h $(TOP)\src\prop.h $(TOP)\src\sigfile.h $(TOP)\src\size.h $(TOP)\src\thread.h $(TOP)\src\version.h $(TOP)\src\vmaid.h | |
148 | +src\change.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\src\size.h $(TOP)\src\thread.h $(TOP)\src\vmaid.h | |
149 | 149 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
150 | 150 | |
151 | -src\file.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\misc.h $(TOP)\src\size.h $(TOP)\src\thread.h $(TOP)\src\vmaid.h | |
151 | +src\codec.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\acm.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\src\vmaid.h | |
152 | 152 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
153 | 153 | |
154 | -src\general.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\misc.h $(TOP)\orz\orzmdi.h $(TOP)\src\command.h $(TOP)\src\file.h $(TOP)\src\menu.h $(TOP)\src\sigfile.h $(TOP)\src\size.h $(TOP)\src\thread.h $(TOP)\src\vmaid.h | |
154 | +src\command.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\aviclip.h $(TOP)\avicore\avicore.h $(TOP)\avicore\aviextra.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\orz\orzhistory.h $(TOP)\orz\orzmdi.h $(TOP)\orz\orzpref.h $(TOP)\src\change.h $(TOP)\src\codec.h $(TOP)\src\file.h $(TOP)\src\general.h $(TOP)\src\jump.h $(TOP)\src\menu.h $(TOP)\src\merge.h $(TOP)\src\preview.h $(TOP)\src\prop.h $(TOP)\src\sigfile.h $(TOP)\src\size.h $(TOP)\src\thread.h $(TOP)\src\version.h $(TOP)\src\vmaid.h | |
155 | 155 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
156 | 156 | |
157 | -src\icons.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\src\vmaid.h | |
157 | +src\file.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\src\size.h $(TOP)\src\thread.h $(TOP)\src\vmaid.h | |
158 | 158 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
159 | 159 | |
160 | -src\jump.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\misc.h $(TOP)\src\vmaid.h | |
160 | +src\general.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\orz\orzmdi.h $(TOP)\src\command.h $(TOP)\src\file.h $(TOP)\src\menu.h $(TOP)\src\sigfile.h $(TOP)\src\size.h $(TOP)\src\thread.h $(TOP)\src\vmaid.h | |
161 | 161 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
162 | 162 | |
163 | -src\keyfile.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\profile.h $(TOP)\orz\orzhistory.h $(TOP)\src\vmaid.h | |
163 | +src\icons.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h $(TOP)\src\vmaid.h | |
164 | 164 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
165 | 165 | |
166 | -src\menu.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\misc.h $(TOP)\src\command.h $(TOP)\src\icons.h $(TOP)\src\vmaid.h | |
166 | +src\jump.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\src\vmaid.h | |
167 | 167 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
168 | 168 | |
169 | -src\merge.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\misc.h $(TOP)\orz\orzmdi.h $(TOP)\src\file.h $(TOP)\src\size.h $(TOP)\src\thread.h $(TOP)\src\vmaid.h | |
169 | +src\keyfile.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h $(TOP)\orz\orzhistory.h $(TOP)\src\vmaid.h | |
170 | 170 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
171 | 171 | |
172 | -src\preview.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\aviplay.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\src\vmaid.h | |
172 | +src\menu.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\src\command.h $(TOP)\src\icons.h $(TOP)\src\vmaid.h | |
173 | 173 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
174 | 174 | |
175 | -src\prop.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\misc.h $(TOP)\src\vmaid.h | |
175 | +src\merge.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\orz\orzmdi.h $(TOP)\src\file.h $(TOP)\src\size.h $(TOP)\src\thread.h $(TOP)\src\vmaid.h | |
176 | 176 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
177 | 177 | |
178 | -src\sigfile.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\misc.h $(TOP)\orz\orzmdi.h $(TOP)\src\command.h $(TOP)\src\file.h $(TOP)\src\general.h $(TOP)\src\menu.h $(TOP)\src\vmaid.h | |
178 | +src\preview.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\aviplay.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\profile.h $(TOP)\src\vmaid.h | |
179 | 179 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
180 | 180 | |
181 | -src\sigmain.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\argument.h $(TOP)\misc\bitmap.h $(TOP)\misc\misc.h $(TOP)\orz\orzhistory.h $(TOP)\orz\orzmdi.h $(TOP)\src\command.h $(TOP)\src\file.h $(TOP)\src\general.h $(TOP)\src\menu.h $(TOP)\src\sigfile.h $(TOP)\src\thread.h $(TOP)\src\vmaid.h | |
181 | +src\prop.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\src\vmaid.h | |
182 | 182 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
183 | 183 | |
184 | -src\size.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\misc.h $(TOP)\src\vmaid.h | |
184 | +src\sigfile.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\orz\orzmdi.h $(TOP)\src\command.h $(TOP)\src\file.h $(TOP)\src\general.h $(TOP)\src\menu.h $(TOP)\src\vmaid.h | |
185 | 185 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
186 | 186 | |
187 | -src\thread.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\misc.h $(TOP)\orz\orzhistory.h $(TOP)\orz\orzmdi.h $(TOP)\src\general.h $(TOP)\src\icons.h $(TOP)\src\menu.h $(TOP)\src\sigfile.h $(TOP)\src\sigmain.h $(TOP)\src\vmaid.h | |
187 | +src\sigmain.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\argument.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\orz\orzhistory.h $(TOP)\orz\orzmdi.h $(TOP)\src\command.h $(TOP)\src\file.h $(TOP)\src\general.h $(TOP)\src\menu.h $(TOP)\src\sigfile.h $(TOP)\src\thread.h $(TOP)\src\vmaid.h | |
188 | 188 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
189 | 189 | |
190 | -src\version.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\acm.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\gnugpl.h $(TOP)\misc\misc.h $(TOP)\src\icons.h $(TOP)\src\vmaid.h | |
190 | +src\size.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\src\vmaid.h | |
191 | 191 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
192 | 192 | |
193 | -src\vmaid.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\gcommon.h $(TOP)\avicore\aviclip.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\argument.h $(TOP)\misc\bitmap.h $(TOP)\misc\gnugpl.h $(TOP)\misc\license.h $(TOP)\misc\misc.h $(TOP)\orz\orzaccel.h $(TOP)\orz\orzcomm.h $(TOP)\orz\orzhistory.h $(TOP)\orz\orzmdi.h $(TOP)\orz\orzwinmenu.h $(TOP)\src\file.h $(TOP)\src\general.h $(TOP)\src\icons.h $(TOP)\src\keyfile.h $(TOP)\src\menu.h $(TOP)\src\sigfile.h $(TOP)\src\sigmain.h $(TOP)\src\thread.h | |
193 | +src\thread.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\fileio.h $(TOP)\misc\gcommon.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\orz\orzhistory.h $(TOP)\orz\orzmdi.h $(TOP)\src\general.h $(TOP)\src\icons.h $(TOP)\src\menu.h $(TOP)\src\sigfile.h $(TOP)\src\sigmain.h $(TOP)\src\vmaid.h | |
194 | 194 | $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c |
195 | 195 | |
196 | +src\version.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\acm.h $(TOP)\avicore\avicore.h $(TOP)\avicore\icm.h $(TOP)\avicore\wave.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\gnugpl.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\src\icons.h $(TOP)\src\vmaid.h | |
197 | + $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c | |
198 | + | |
199 | +src\vmaid.obj: $(TOP)\$*.c $(TOP)\$*.h $(TOP)\avicore\aviclip.h $(TOP)\avicore\avicore.h $(TOP)\avicore\wave.h $(TOP)\misc\argument.h $(TOP)\misc\bitmap.h $(TOP)\misc\gcommon.h $(TOP)\misc\gnugpl.h $(TOP)\misc\license.h $(TOP)\misc\misc.h $(TOP)\misc\profile.h $(TOP)\orz\orzaccel.h $(TOP)\orz\orzcomm.h $(TOP)\orz\orzhistory.h $(TOP)\orz\orzmdi.h $(TOP)\orz\orzwinmenu.h $(TOP)\src\file.h $(TOP)\src\general.h $(TOP)\src\icons.h $(TOP)\src\keyfile.h $(TOP)\src\menu.h $(TOP)\src\sigfile.h $(TOP)\src\sigmain.h $(TOP)\src\thread.h | |
200 | + $(CC) $(CLFLAGS) $(DEFINES) $(INCLUDES) $(TOP)\$*.c | |
201 | + | |
196 | 202 | src\vmaid.res: $(TOP)\$*.rc $(TOP)\$*.ico |
197 | 203 | $(RC) $(RCFLAGS) $(TOP)\$*.rc |
198 | 204 |
@@ -220,9 +226,11 @@ | ||
220 | 226 | if exist misc\argument.obj del /q misc\argument.obj |
221 | 227 | if exist misc\bitmap.obj del /q misc\bitmap.obj |
222 | 228 | if exist misc\fileio.obj del /q misc\fileio.obj |
229 | + if exist misc\gcommon.obj del /q misc\gcommon.obj | |
223 | 230 | if exist misc\gnugpl.obj del /q misc\gnugpl.obj |
224 | 231 | if exist misc\license.obj del /q misc\license.obj |
225 | 232 | if exist misc\misc.obj del /q misc\misc.obj |
233 | + if exist misc\peimage.obj del /q misc\peimage.obj | |
226 | 234 | if exist misc\pixbuf.obj del /q misc\pixbuf.obj |
227 | 235 | if exist misc\profile.obj del /q misc\profile.obj |
228 | 236 | if exist misc\winmain.obj del /q misc\winmain.obj |
@@ -262,8 +270,6 @@ | ||
262 | 270 | copy /y vmaid.exe vmaid-$(VERSION)-win32\bin |
263 | 271 | mkdir vmaid-$(VERSION)-win32\doc |
264 | 272 | mkdir vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION) |
265 | - mkdir vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)\en | |
266 | - mkdir vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)\ja | |
267 | 273 | copy /y $(TOP)\AUTHORS vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION) |
268 | 274 | copy /y $(TOP)\CONTRIBUTORS vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION) |
269 | 275 | copy /y $(TOP)\COPYING vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION) |
@@ -272,12 +278,10 @@ | ||
272 | 278 | copy /y $(TOP)\INSTALL.ja vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION) |
273 | 279 | copy /y $(TOP)\NEWS vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION) |
274 | 280 | copy /y $(TOP)\README vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION) |
275 | - copy /y $(TOP)\doc\en\*.html vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)\en | |
276 | - copy /y $(TOP)\doc\ja\*.html vmaid-$(VERSION)-win32\doc\vmaid-$(VERSION)\ja | |
277 | - mkdir vmaid-$(VERSION)-win32\share | |
278 | - mkdir vmaid-$(VERSION)-win32\share\locale | |
279 | - mkdir vmaid-$(VERSION)-win32\share\locale\ja | |
280 | - mkdir vmaid-$(VERSION)-win32\share\locale\ja\LC_MESSAGES | |
281 | - copy /y locale\ja\LC_MESSAGES\vmaid.mo vmaid-$(VERSION)-win32\share\locale\ja\LC_MESSAGES | |
281 | + mkdir vmaid-$(VERSION)-win32\lib | |
282 | + mkdir vmaid-$(VERSION)-win32\lib\locale | |
283 | + mkdir vmaid-$(VERSION)-win32\lib\locale\ja | |
284 | + mkdir vmaid-$(VERSION)-win32\lib\locale\ja\LC_MESSAGES | |
285 | + copy /y locale\ja\LC_MESSAGES\vmaid.mo vmaid-$(VERSION)-win32\lib\locale\ja\LC_MESSAGES | |
282 | 286 | zip -9 -r vmaid-$(VERSION)-win32.zip vmaid-$(VERSION)-win32 |
283 | 287 | rmdir /q /s vmaid-$(VERSION)-win32 |
@@ -5,7 +5,7 @@ | ||
5 | 5 | dnl version number |
6 | 6 | MAJOR_VERSION=2 |
7 | 7 | MINOR_VERSION=2 |
8 | -MICRO_VERSION=3 | |
8 | +MICRO_VERSION=4 | |
9 | 9 | EXTRA_VERSION= |
10 | 10 | VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION |
11 | 11 |
@@ -13,6 +13,9 @@ | ||
13 | 13 | AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") |
14 | 14 | AC_DEFINE_UNQUOTED(VERSION,"$VERSION") |
15 | 15 | |
16 | +AC_USE_SYSTEM_EXTENSIONS | |
17 | +AC_CONFIG_MACRO_DIR([m4]) | |
18 | + | |
16 | 19 | dnl Getting the Canonical System Type |
17 | 20 | AC_CANONICAL_HOST |
18 | 21 | AC_DEFINE_UNQUOTED(BUILD_ENVIRONMENT,"${host}",Define to the build environment.) |
@@ -23,9 +26,10 @@ | ||
23 | 26 | dnl ************************************************************** |
24 | 27 | dnl Checks for programs. |
25 | 28 | dnl ************************************************************** |
29 | +AC_C_BIGENDIAN | |
30 | +AC_ISC_POSIX | |
26 | 31 | AC_PROG_CC |
27 | 32 | AC_PROG_INSTALL |
28 | -AC_ISC_POSIX | |
29 | 33 | AC_PROG_MAKE_SET |
30 | 34 | AM_MAINTAINER_MODE |
31 | 35 |
@@ -54,6 +58,7 @@ | ||
54 | 58 | else |
55 | 59 | AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR(Test for GTK+-2.0 failed.)) |
56 | 60 | fi |
61 | +AC_DEFINE(USE_GTK,1,Define to 1 if enable GTK+.) | |
57 | 62 | |
58 | 63 | dnl ************************************************************** |
59 | 64 | dnl enable/disable libao support. |
@@ -188,8 +193,8 @@ | ||
188 | 193 | dnl ************************************************************** |
189 | 194 | dnl Checks for header files. |
190 | 195 | dnl ************************************************************** |
191 | -AC_HEADER_STDC | |
192 | -AC_CHECK_HEADERS(arpa/inet.h arpa/nameser.h complex.h fcntl.h netdb.h netinet/in.h resolv.h strings.h sys/file.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/timeb.h sys/types.h unistd.h utime.h) | |
196 | +AC_HEADER_STDBOOL | |
197 | +AC_CHECK_HEADERS(arpa/inet.h arpa/nameser.h complex.h fcntl.h netdb.h netinet/in.h resolv.h stdint.h sys/file.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/timeb.h sys/types.h unistd.h utime.h) | |
193 | 198 | |
194 | 199 | dnl ************************************************************** |
195 | 200 | dnl Checks for typedefs, structures, and compiler characteristics. |
@@ -213,7 +218,7 @@ | ||
213 | 218 | AC_FUNC_STRCOLL |
214 | 219 | AC_FUNC_STRFTIME |
215 | 220 | AC_FUNC_VPRINTF |
216 | -AC_CHECK_FUNCS(flock ftruncate utime) | |
221 | +AC_CHECK_FUNCS(asprintf flock ftruncate utime vasprintf) | |
217 | 222 | |
218 | 223 | AC_OUTPUT([ |
219 | 224 | Makefile |
@@ -5,8 +5,9 @@ | ||
5 | 5 | INSTALL.ja \ |
6 | 6 | Makefile.msc \ |
7 | 7 | autogen.sh \ |
8 | - gcommon.h \ | |
9 | 8 | vmaid16.png \ |
10 | 9 | vmaid24.png \ |
11 | 10 | vmaid32.png \ |
12 | 11 | vmaid48.png |
12 | + | |
13 | +ACLOCAL_AMFLAGS = -I m4 |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | orzhistory |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -19,7 +19,7 @@ | ||
19 | 19 | #define __ORZ_HISTORY_H__ |
20 | 20 | |
21 | 21 | |
22 | -#include "gcommon.h" | |
22 | +#include "misc/gcommon.h" | |
23 | 23 | |
24 | 24 | |
25 | 25 | G_BEGIN_DECLS |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | orzaccel |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -19,7 +19,7 @@ | ||
19 | 19 | #define __ORZ_ACCEL_H__ |
20 | 20 | |
21 | 21 | |
22 | -#include "gcommon.h" | |
22 | +#include "misc/gcommon.h" | |
23 | 23 | |
24 | 24 | |
25 | 25 | G_BEGIN_DECLS |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | orzmdi |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -19,7 +19,7 @@ | ||
19 | 19 | #define __ORZ_MDI_H__ |
20 | 20 | |
21 | 21 | |
22 | -#include "gcommon.h" | |
22 | +#include "misc/gcommon.h" | |
23 | 23 | |
24 | 24 | |
25 | 25 | G_BEGIN_DECLS |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | orzcomm |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -19,7 +19,7 @@ | ||
19 | 19 | #define __ORZ_COMM_H__ |
20 | 20 | |
21 | 21 | |
22 | -#include "gcommon.h" | |
22 | +#include "misc/gcommon.h" | |
23 | 23 | #ifdef G_OS_WIN32 |
24 | 24 | # include <windows.h> |
25 | 25 | #endif /* G_OS_WIN32 */ |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /* |
2 | 2 | orzpref |
3 | - copyright (c) 1998-2008 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org | |
3 | + copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org | |
4 | 4 | |
5 | 5 | This program is free software: you can redistribute it and/or modify |
6 | 6 | it under the terms of the GNU General Public License as published by |
@@ -19,7 +19,7 @@ | ||
19 | 19 | #define __ORZ_PREF_H__ |
20 | 20 | |
21 | 21 | |
22 | -#include "gcommon.h" | |
22 | +#include "misc/gcommon.h" | |
23 | 23 | |
24 | 24 | |
25 | 25 | G_BEGIN_DECLS |
@@ -1,15 +1,15 @@ | ||
1 | 1 | # Video maid ja.po |
2 | -# Copyright (C) 1998-2008 Kazuki IWAMOTO | |
3 | -# Kazuki IWAMOTO <iwm@maid.org>, 1998-2007. | |
2 | +# Copyright (C) 1998-2010 Kazuki Iwamoto | |
3 | +# Kazuki Iwamoto <iwm@maid.org>, 1998-2010. | |
4 | 4 | # |
5 | 5 | msgid "" |
6 | 6 | msgstr "" |
7 | -"Project-Id-Version: vmaid 2.2.1\n" | |
7 | +"Project-Id-Version: vmaid 2.2.4\n" | |
8 | 8 | "Report-Msgid-Bugs-To: http://www.maid.org/\n" |
9 | -"POT-Creation-Date: 2010-02-09 18:47+0900\n" | |
9 | +"POT-Creation-Date: 2010-05-29 00:20+0900\n" | |
10 | 10 | "PO-Revision-Date: 2002-07-25 03:38+0900\n" |
11 | -"Last-Translator: Kazuki IWAMOTO <iwm@maid.org>\n" | |
12 | -"Language-Team: Kazuki IWAMOTO <iwm@maid.org>\n" | |
11 | +"Last-Translator: Kazuki Iwamoto <iwm@maid.org>\n" | |
12 | +"Language-Team: Kazuki Iwamoto <iwm@maid.org>\n" | |
13 | 13 | "MIME-Version: 1.0\n" |
14 | 14 | "Content-Type: text/plain; charset=UTF-8\n" |
15 | 15 | "Content-Transfer-Encoding: 8bit\n" |