[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemacs-commit] qemacs .cvsignore arabic.c buffer.c cfb.c chars...
|
From: |
Charlie Gordon |
|
Subject: |
[Qemacs-commit] qemacs .cvsignore arabic.c buffer.c cfb.c chars... |
|
Date: |
Wed, 16 Sep 2015 22:18:26 +0000 |
CVSROOT: /sources/qemacs
Module name: qemacs
Changes by: Charlie Gordon <chqrlie> 15/09/16 22:18:26
Modified files:
. : .cvsignore arabic.c buffer.c cfb.c charset.c
charsetjis.c cutils.h display.c display.h
extras.c fbfrender.c haiku.cpp html.c
html2png.c input.c list.c perl.c qe.c qe.h
qeend.c search.c shell.c tty.c unix.c x11.c
libqhtml : css.c cssparse.c xmlparse.c
Log message:
portability: stop defining symbols starting with __
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/.cvsignore?cvsroot=qemacs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/qemacs/arabic.c?cvsroot=qemacs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/qemacs/buffer.c?cvsroot=qemacs&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/qemacs/cfb.c?cvsroot=qemacs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/qemacs/charset.c?cvsroot=qemacs&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/qemacs/charsetjis.c?cvsroot=qemacs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/qemacs/cutils.h?cvsroot=qemacs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/qemacs/display.c?cvsroot=qemacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/qemacs/display.h?cvsroot=qemacs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/qemacs/extras.c?cvsroot=qemacs&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/qemacs/fbfrender.c?cvsroot=qemacs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/qemacs/haiku.cpp?cvsroot=qemacs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/qemacs/html.c?cvsroot=qemacs&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/qemacs/html2png.c?cvsroot=qemacs&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/qemacs/input.c?cvsroot=qemacs&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/qemacs/list.c?cvsroot=qemacs&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/qemacs/perl.c?cvsroot=qemacs&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.216&r2=1.217
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.210&r2=1.211
http://cvs.savannah.gnu.org/viewcvs/qemacs/qeend.c?cvsroot=qemacs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/qemacs/search.c?cvsroot=qemacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/qemacs/shell.c?cvsroot=qemacs&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/qemacs/tty.c?cvsroot=qemacs&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/qemacs/unix.c?cvsroot=qemacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/qemacs/x11.c?cvsroot=qemacs&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/css.c?cvsroot=qemacs&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/cssparse.c?cvsroot=qemacs&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/xmlparse.c?cvsroot=qemacs&r1=1.27&r2=1.28
Patches:
Index: .cvsignore
===================================================================
RCS file: /sources/qemacs/qemacs/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- .cvsignore 22 Mar 2014 13:42:28 -0000 1.11
+++ .cvsignore 16 Sep 2015 22:18:22 -0000 1.12
@@ -27,3 +27,21 @@
doc
junk
.qerc
+
+BUGS
+DONE
+fff
+ggg
+m
+r
+tt
+cflags.mk
+fnmatch.c
+itoa.c
+lang-discuss.md
+rationale.md
+nim.c
+rebol.c
+txl.c
+elm.c
+jai.c
Index: arabic.c
===================================================================
RCS file: /sources/qemacs/qemacs/arabic.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- arabic.c 23 Nov 2013 19:11:13 -0000 1.8
+++ arabic.c 16 Sep 2015 22:18:22 -0000 1.9
@@ -216,7 +216,7 @@
}
/* ctog is NOT filled because it is not needed. We put it for homogoneity */
-int arab_join(unsigned int *line, __unused__ unsigned int *ctog, int len)
+int arab_join(unsigned int *line, qe__unused__ unsigned int *ctog, int len)
{
int a, b, c, i, j, res;
//const ArabicChar *aa;
Index: buffer.c
===================================================================
RCS file: /sources/qemacs/qemacs/buffer.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- buffer.c 10 Sep 2015 00:25:23 -0000 1.98
+++ buffer.c 16 Sep 2015 22:18:23 -0000 1.99
@@ -987,7 +987,7 @@
}
/* standard callback to move offsets */
-void eb_offset_callback(__unused__ EditBuffer *b, void *opaque, int edge,
+void eb_offset_callback(qe__unused__ EditBuffer *b, void *opaque, int edge,
enum LogOperation op, int offset, int size)
{
int *offset_ptr = opaque;
@@ -2036,7 +2036,7 @@
return written;
}
-static void raw_buffer_close(__unused__ EditBuffer *b)
+static void raw_buffer_close(qe__unused__ EditBuffer *b)
{
/* nothing to do */
}
Index: cfb.c
===================================================================
RCS file: /sources/qemacs/qemacs/cfb.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- cfb.c 27 May 2014 22:59:48 -0000 1.10
+++ cfb.c 16 Sep 2015 22:18:23 -0000 1.11
@@ -300,9 +300,9 @@
}
-static void cfb_set_clip(__unused__ QEditScreen *s,
- __unused__ int x, __unused__ int y,
- __unused__ int w, __unused__ int h)
+static void cfb_set_clip(qe__unused__ QEditScreen *s,
+ qe__unused__ int x, qe__unused__ int y,
+ qe__unused__ int w, qe__unused__ int h)
{
}
Index: charset.c
===================================================================
RCS file: /sources/qemacs/qemacs/charset.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- charset.c 27 Aug 2015 23:03:40 -0000 1.41
+++ charset.c 16 Sep 2015 22:18:23 -0000 1.42
@@ -107,7 +107,7 @@
s->table = table_idem;
}
-static u8 *encode_raw(__unused__ QECharset *charset, u8 *p, int c)
+static u8 *encode_raw(qe__unused__ QECharset *charset, u8 *p, int c)
{
if (c <= 0xff) {
*p++ = c;
@@ -134,7 +134,7 @@
/********************************************************/
/* 8859-1 */
-static int probe_8859_1(__unused__ QECharset *charset, const u8 *buf, int size)
+static int probe_8859_1(qe__unused__ QECharset *charset, const u8 *buf, int
size)
{
static const uint32_t magic = (1 << '\b') | (1 << '\t') | (1 << '\f') |
(1 << '\n') | (1 << '\r') | (1 << '\033') |
@@ -179,7 +179,7 @@
s->table = table_idem;
}
-static u8 *encode_8859_1(__unused__ QECharset *charset, u8 *p, int c)
+static u8 *encode_8859_1(qe__unused__ QECharset *charset, u8 *p, int c)
{
if (c <= 0xff) {
*p++ = c;
@@ -211,7 +211,7 @@
s->table = table_idem;
}
-static u8 *encode_vt100(__unused__ QECharset *charset, u8 *p, int c)
+static u8 *encode_vt100(qe__unused__ QECharset *charset, u8 *p, int c)
{
if (c <= 0xff) {
*p++ = c;
@@ -238,7 +238,7 @@
/********************************************************/
/* 7 bit */
-static u8 *encode_7bit(__unused__ QECharset *charset, u8 *p, int c)
+static u8 *encode_7bit(qe__unused__ QECharset *charset, u8 *p, int c)
{
if (c <= 0x7f) {
*p++ = c;
@@ -361,7 +361,7 @@
return uq - dest;
}
-static int probe_utf8(__unused__ QECharset *charset, const u8 *buf, int size)
+static int probe_utf8(qe__unused__ QECharset *charset, const u8 *buf, int size)
{
static const uint32_t magic = (1 << '\b') | (1 << '\t') | (1 << '\f') |
(1 << '\n') | (1 << '\r') | (1 << '\033') |
@@ -445,7 +445,7 @@
return utf8_decode((const char **)(void *)&s->p);
}
-static u8 *encode_utf8(__unused__ QECharset *charset, u8 *q, int c)
+static u8 *encode_utf8(qe__unused__ QECharset *charset, u8 *q, int c)
{
return q + utf8_encode((char*)q, c);
}
@@ -565,7 +565,7 @@
/********************************************************/
/* UCS2/UCS4 */
-static int probe_ucs2le(__unused__ QECharset *charset, const u8 *buf, int size)
+static int probe_ucs2le(qe__unused__ QECharset *charset, const u8 *buf, int
size)
{
static const uint32_t magic = (1 << '\b') | (1 << '\t') | (1 << '\f') |
(1 << '\n') | (1 << '\r') | (1 << '\033') |
@@ -618,7 +618,7 @@
return p[0] + (p[1] << 8);
}
-static u8 *encode_ucs2le(__unused__ QECharset *charset, u8 *p, int c)
+static u8 *encode_ucs2le(qe__unused__ QECharset *charset, u8 *p, int c)
{
/* XXX: should handle surrogates */
p[0] = c;
@@ -701,7 +701,7 @@
return (const u8 *)lp - buf;
}
-static int probe_ucs2be(__unused__ QECharset *charset, const u8 *buf, int size)
+static int probe_ucs2be(qe__unused__ QECharset *charset, const u8 *buf, int
size)
{
static const uint32_t magic = (1 << '\b') | (1 << '\t') | (1 << '\f') |
(1 << '\n') | (1 << '\r') | (1 << '\033') |
@@ -749,7 +749,7 @@
return (p[0] << 8) + p[1];
}
-static u8 *encode_ucs2be(__unused__ QECharset *charset, u8 *p, int c)
+static u8 *encode_ucs2be(qe__unused__ QECharset *charset, u8 *p, int c)
{
/* XXX: should handle surrogates */
p[0] = c >> 8;
@@ -845,7 +845,7 @@
2, 0, 0, 10, 0, 0, NULL, NULL,
};
-static int probe_ucs4le(__unused__ QECharset *charset, const u8 *buf, int size)
+static int probe_ucs4le(qe__unused__ QECharset *charset, const u8 *buf, int
size)
{
static const uint32_t magic = (1 << '\b') | (1 << '\t') | (1 << '\f') |
(1 << '\n') | (1 << '\r') | (1 << '\033') |
@@ -892,7 +892,7 @@
return p[0] + (p[1] << 8) + (p[2] << 16) + (p[3] << 24);
}
-static u8 *encode_ucs4le(__unused__ QECharset *charset, u8 *p, int c)
+static u8 *encode_ucs4le(qe__unused__ QECharset *charset, u8 *p, int c)
{
p[0] = c;
p[1] = c >> 8;
@@ -975,7 +975,7 @@
return (const u8 *)lp - buf;
}
-static int probe_ucs4be(__unused__ QECharset *charset, const u8 *buf, int size)
+static int probe_ucs4be(qe__unused__ QECharset *charset, const u8 *buf, int
size)
{
static const uint32_t magic = (1 << '\b') | (1 << '\t') | (1 << '\f') |
(1 << '\n') | (1 << '\r') | (1 << '\033') |
@@ -1022,7 +1022,7 @@
return (p[0] << 24) + (p[1] << 16) + (p[2] << 8) + p[3];
}
-static u8 *encode_ucs4be(__unused__ QECharset *charset, u8 *p, int c)
+static u8 *encode_ucs4be(qe__unused__ QECharset *charset, u8 *p, int c)
{
p[0] = c >> 24;
p[1] = c >> 16;
Index: charsetjis.c
===================================================================
RCS file: /sources/qemacs/qemacs/charsetjis.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- charsetjis.c 19 Aug 2015 16:22:30 -0000 1.8
+++ charsetjis.c 16 Sep 2015 22:18:23 -0000 1.9
@@ -127,7 +127,7 @@
return c;
}
-static unsigned char *encode_euc_jp(__unused__ QECharset *s,
+static unsigned char *encode_euc_jp(qe__unused__ QECharset *s,
unsigned char *q, int c)
{
if (c <= 0x7f) {
@@ -210,7 +210,7 @@
return c;
}
-static unsigned char *encode_sjis(__unused__ QECharset *s,
+static unsigned char *encode_sjis(qe__unused__ QECharset *s,
unsigned char *q, int c)
{
if (c <= 0x7f) {
Index: cutils.h
===================================================================
RCS file: /sources/qemacs/qemacs/cutils.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- cutils.h 4 Feb 2014 03:28:14 -0000 1.16
+++ cutils.h 16 Sep 2015 22:18:23 -0000 1.17
@@ -72,7 +72,7 @@
return head->next == head;
}
-static inline void __list_add(struct list_head *elem,
+static inline void qe__list_add(struct list_head *elem,
struct list_head *prev, struct list_head *next)
{
next->prev = elem;
@@ -81,7 +81,7 @@
elem->prev = prev;
}
-static inline void __list_del(struct list_head *prev, struct list_head *next)
+static inline void qe__list_del(struct list_head *prev, struct list_head *next)
{
prev->next = next;
next->prev = prev;
@@ -91,14 +91,14 @@
/* add at the head */
#define list_add(elem, head) \
- __list_add((struct list_head *)elem, head, (head)->next);
+ qe__list_add((struct list_head *)elem, head, (head)->next);
/* add at tail */
#define list_add_tail(elem, head) \
- __list_add((struct list_head *)elem, (head)->prev, head)
+ qe__list_add((struct list_head *)elem, (head)->prev, head)
/* delete */
-#define list_del(elem) __list_del(((struct list_head *)elem)->prev, \
+#define list_del(elem) qe__list_del(((struct list_head *)elem)->prev, \
((struct list_head *)elem)->next)
#define list_for_each(elem, head) \
Index: display.c
===================================================================
RCS file: /sources/qemacs/qemacs/display.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- display.c 16 Sep 2015 21:43:22 -0000 1.17
+++ display.c 16 Sep 2015 22:18:23 -0000 1.18
@@ -24,67 +24,67 @@
/* dummy display driver for initialization time */
-static int dummy_dpy_init(QEditScreen *s, __unused__ int w, __unused__ int h)
+static int dummy_dpy_init(QEditScreen *s, qe__unused__ int w, qe__unused__ int
h)
{
s->charset = &charset_8859_1;
return 0;
}
-static void dummy_dpy_close(__unused__ QEditScreen *s)
+static void dummy_dpy_close(qe__unused__ QEditScreen *s)
{
}
-static void dummy_dpy_flush(__unused__ QEditScreen *s)
+static void dummy_dpy_flush(qe__unused__ QEditScreen *s)
{
}
-static int dummy_dpy_is_user_input_pending(__unused__ QEditScreen *s)
+static int dummy_dpy_is_user_input_pending(qe__unused__ QEditScreen *s)
{
return 0;
}
-static void dummy_dpy_fill_rectangle(__unused__ QEditScreen *s,
- __unused__ int x1, __unused__ int y1,
- __unused__ int w, __unused__ int h,
- __unused__ QEColor color)
+static void dummy_dpy_fill_rectangle(qe__unused__ QEditScreen *s,
+ qe__unused__ int x1, qe__unused__ int y1,
+ qe__unused__ int w, qe__unused__ int h,
+ qe__unused__ QEColor color)
{
}
-static QEFont *dummy_dpy_open_font(__unused__ QEditScreen *s,
- __unused__ int style, __unused__ int size)
+static QEFont *dummy_dpy_open_font(qe__unused__ QEditScreen *s,
+ qe__unused__ int style, qe__unused__ int
size)
{
return NULL;
}
-static void dummy_dpy_close_font(__unused__ QEditScreen *s,
- __unused__ QEFont **fontp)
+static void dummy_dpy_close_font(qe__unused__ QEditScreen *s,
+ qe__unused__ QEFont **fontp)
{
}
-static void dummy_dpy_text_metrics(__unused__ QEditScreen *s,
- __unused__ QEFont *font,
+static void dummy_dpy_text_metrics(qe__unused__ QEditScreen *s,
+ qe__unused__ QEFont *font,
QECharMetrics *metrics,
- __unused__ const unsigned int *str,
- __unused__ int len)
+ qe__unused__ const unsigned int *str,
+ qe__unused__ int len)
{
metrics->font_ascent = 1;
metrics->font_descent = 0;
metrics->width = len;
}
-static void dummy_dpy_draw_text(__unused__ QEditScreen *s,
- __unused__ QEFont *font,
- __unused__ int x, __unused__ int y,
- __unused__ const unsigned int *str,
- __unused__ int len,
- __unused__ QEColor color)
+static void dummy_dpy_draw_text(qe__unused__ QEditScreen *s,
+ qe__unused__ QEFont *font,
+ qe__unused__ int x, qe__unused__ int y,
+ qe__unused__ const unsigned int *str,
+ qe__unused__ int len,
+ qe__unused__ QEColor color)
{
}
-static void dummy_dpy_set_clip(__unused__ QEditScreen *s,
- __unused__ int x, __unused__ int y,
- __unused__ int w, __unused__ int h)
+static void dummy_dpy_set_clip(qe__unused__ QEditScreen *s,
+ qe__unused__ int x, qe__unused__ int y,
+ qe__unused__ int w, qe__unused__ int h)
{
}
Index: display.h
===================================================================
RCS file: /sources/qemacs/qemacs/display.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- display.h 16 Sep 2015 21:43:22 -0000 1.16
+++ display.h 16 Sep 2015 22:18:23 -0000 1.17
@@ -250,12 +250,12 @@
void free_font_cache(QEditScreen *s);
QEFont *select_font(QEditScreen *s, int style, int size);
-static inline QEFont *lock_font(__unused__ QEditScreen *s, QEFont *font) {
+static inline QEFont *lock_font(qe__unused__ QEditScreen *s, QEFont *font) {
if (font && font->refcount)
font->refcount++;
return font;
}
-static inline void release_font(__unused__ QEditScreen *s, QEFont *font) {
+static inline void release_font(qe__unused__ QEditScreen *s, QEFont *font) {
if (font && font->refcount)
font->refcount--;
}
Index: extras.c
===================================================================
RCS file: /sources/qemacs/qemacs/extras.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- extras.c 27 Aug 2015 23:03:40 -0000 1.37
+++ extras.c 16 Sep 2015 22:18:23 -0000 1.38
@@ -663,7 +663,7 @@
}
static void print_bindings(EditBuffer *b, const char *title,
- __unused__ int type, ModeDef *mode)
+ qe__unused__ int type, ModeDef *mode)
{
char buf[256];
CmdDef *d;
Index: fbfrender.c
===================================================================
RCS file: /sources/qemacs/qemacs/fbfrender.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- fbfrender.c 23 Jan 2014 12:56:22 -0000 1.13
+++ fbfrender.c 16 Sep 2015 22:18:23 -0000 1.14
@@ -229,7 +229,7 @@
#define MAX_MATCHES 32
-QEFont *fbf_open_font(__unused__ QEditScreen *s, int style, int size)
+QEFont *fbf_open_font(qe__unused__ QEditScreen *s, int style, int size)
{
QEFont *font;
UniFontData *uf, *uf_found;
@@ -276,17 +276,17 @@
return font;
}
-void fbf_close_font(__unused__ QEditScreen *s, QEFont **fontp)
+void fbf_close_font(qe__unused__ QEditScreen *s, QEFont **fontp)
{
qe_free(fontp);
}
-static void *my_malloc(__unused__ void *opaque, int size)
+static void *my_malloc(qe__unused__ void *opaque, int size)
{
return qe_malloc_bytes(size);
}
-static void my_free(__unused__ void *opaque, void *ptr)
+static void my_free(qe__unused__ void *opaque, void *ptr)
{
qe_free(&ptr);
}
@@ -469,7 +469,7 @@
return 0;
}
-int fbf_render_init(__unused__ const char *font_path)
+int fbf_render_init(qe__unused__ const char *font_path)
{
const struct fbf_font *pp;
Index: haiku.cpp
===================================================================
RCS file: /sources/qemacs/qemacs/haiku.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- haiku.cpp 7 Feb 2014 23:42:23 -0000 1.11
+++ haiku.cpp 16 Sep 2015 22:18:24 -0000 1.12
@@ -848,7 +848,7 @@
return 0;
}
-static void haiku_bmp_free(__unused__ QEditScreen *s, QEBitmap *b)
+static void haiku_bmp_free(qe__unused__ QEditScreen *s, QEBitmap *b)
{
BBitmap *bitmap = (BBitmap *)b->priv_data;
delete bitmap;
Index: html.c
===================================================================
RCS file: /sources/qemacs/qemacs/html.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- html.c 31 Aug 2015 08:51:17 -0000 1.36
+++ html.c 16 Sep 2015 22:18:24 -0000 1.37
@@ -56,7 +56,7 @@
#define MAX_LINE_SIZE 256
static int recompute_offset_func(void *opaque, CSSBox *box,
- __unused__ int x0, __unused__ int y0)
+ qe__unused__ int x0, qe__unused__ int y0)
{
RecomputeOffsetData *data = opaque;
int offsets[MAX_LINE_SIZE+1];
@@ -140,7 +140,7 @@
#endif
-static int html_test_abort(__unused__ void *opaque)
+static int html_test_abort(qe__unused__ void *opaque)
{
return is_user_input_pending();
}
@@ -358,7 +358,7 @@
int offsetc;
} ScrollContext;
-static int scroll_func(void *opaque, CSSBox *box, __unused__ int x, int y)
+static int scroll_func(void *opaque, CSSBox *box, qe__unused__ int x, int y)
{
ScrollContext *m = opaque;
int y1;
@@ -780,11 +780,11 @@
}
/* invalidate the html data if modification done (XXX: be more precise) */
-static void html_callback(__unused__ EditBuffer *b,
- void *opaque, __unused__ int arg,
- __unused__ enum LogOperation op,
- __unused__ int offset,
- __unused__ int size)
+static void html_callback(qe__unused__ EditBuffer *b,
+ void *opaque, qe__unused__ int arg,
+ qe__unused__ enum LogOperation op,
+ qe__unused__ int offset,
+ qe__unused__ int size)
{
HTMLState *hs = opaque;
Index: html2png.c
===================================================================
RCS file: /sources/qemacs/qemacs/html2png.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- html2png.c 27 May 2014 22:59:48 -0000 1.15
+++ html2png.c 16 Sep 2015 22:18:24 -0000 1.16
@@ -35,7 +35,7 @@
/* file I/O for the qHTML library */
-CSSFile *css_open(__unused__ CSSContext *s, const char *filename)
+CSSFile *css_open(qe__unused__ CSSContext *s, const char *filename)
{
FILE *f;
f = fopen(filename, "rb");
@@ -75,7 +75,7 @@
fprintf(stderr, "%s:%d: %s\n", filename, line_num, msg);
}
-void put_error(__unused__ EditState *s, const char *fmt, ...)
+void put_error(qe__unused__ EditState *s, const char *fmt, ...)
{
va_list ap;
@@ -87,16 +87,16 @@
/* dummy functions */
-int eb_nextc(__unused__ EditBuffer *b,
- __unused__ int offset, __unused__ int *next_ptr)
+int eb_nextc(qe__unused__ EditBuffer *b,
+ qe__unused__ int offset, qe__unused__ int *next_ptr)
{
return 0;
}
/* find a resource file */
/* XXX: suppress that */
-int find_resource_file(__unused__ char *path, __unused__ int path_size,
- __unused__ const char *pattern)
+int find_resource_file(qe__unused__ char *path, qe__unused__ int path_size,
+ qe__unused__ const char *pattern)
{
return -1;
}
@@ -322,7 +322,7 @@
}
#endif
-static int html_test_abort(__unused__ void *opaque)
+static int html_test_abort(qe__unused__ void *opaque)
{
return 0;
}
Index: input.c
===================================================================
RCS file: /sources/qemacs/qemacs/input.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- input.c 5 Apr 2008 23:04:57 -0000 1.21
+++ input.c 16 Sep 2015 22:18:24 -0000 1.22
@@ -21,12 +21,12 @@
#include "qe.h"
-static int default_input(__unused__ int *match_buf,
- __unused__ int match_buf_size,
- __unused__ int *match_len_ptr,
- __unused__ const u8 *data,
- __unused__ const unsigned int *buf,
- __unused__ int len)
+static int default_input(qe__unused__ int *match_buf,
+ qe__unused__ int match_buf_size,
+ qe__unused__ int *match_len_ptr,
+ qe__unused__ const u8 *data,
+ qe__unused__ const unsigned int *buf,
+ qe__unused__ int len)
{
return INPUTMETHOD_NOMATCH;
}
@@ -34,7 +34,7 @@
static int unicode_input(int *match_buf,
int match_buf_size,
int *match_len_ptr,
- __unused__ const u8 *data,
+ qe__unused__ const u8 *data,
const unsigned int *buf, int len)
{
int i, h, c;
Index: list.c
===================================================================
RCS file: /sources/qemacs/qemacs/list.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- list.c 9 Aug 2014 17:42:15 -0000 1.19
+++ list.c 16 Sep 2015 22:18:24 -0000 1.20
@@ -25,7 +25,7 @@
static int list_get_colorized_line(EditState *s,
unsigned int *buf, int buf_size,
- int *offsetp, __unused__ int line_num)
+ int *offsetp, qe__unused__ int line_num)
{
QEmacsState *qs = s->qe_state;
int offset, len;
Index: perl.c
===================================================================
RCS file: /sources/qemacs/qemacs/perl.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- perl.c 7 Aug 2015 20:55:41 -0000 1.23
+++ perl.c 16 Sep 2015 22:18:24 -0000 1.24
@@ -61,7 +61,7 @@
return j;
}
-static int perl_number(const unsigned int *str, int j, __unused__ int n)
+static int perl_number(const unsigned int *str, int j, qe__unused__ int n)
{
if (str[j] == '0') {
j++;
Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -b -r1.216 -r1.217
--- qe.c 16 Sep 2015 21:45:27 -0000 1.216
+++ qe.c 16 Sep 2015 22:18:24 -0000 1.217
@@ -45,8 +45,8 @@
int debug_flags;
#ifdef CONFIG_INIT_CALLS
-static int (*__initcall_first)(void) __init_call = NULL;
-static void (*__exitcall_first)(void) __exit_call = NULL;
+static int (*qe__initcall_first)(void) qe__init_call = NULL;
+static void (*qe__exitcall_first)(void) qe__exit_call = NULL;
#endif
static int get_line_height(QEditScreen *screen, int style_index);
@@ -873,7 +873,7 @@
int cursor_func(DisplayState *ds,
int offset1, int offset2, int line_num,
- int x, int y, int w, int h, __unused__ int hex_mode)
+ int x, int y, int w, int h, qe__unused__ int hex_mode)
{
CursorContext *m = ds->cursor_opaque;
@@ -917,10 +917,10 @@
/* called each time the cursor could be displayed */
static int down_cursor_func(DisplayState *ds,
- int offset1, __unused__ int offset2, int line_num,
- int x, __unused__ int y,
- __unused__ int w, __unused__ int h,
- __unused__ int hex_mode)
+ int offset1, qe__unused__ int offset2, int
line_num,
+ int x, qe__unused__ int y,
+ qe__unused__ int w, qe__unused__ int h,
+ qe__unused__ int hex_mode)
{
int d;
MoveContext *m = ds->cursor_opaque;
@@ -1036,10 +1036,10 @@
/* called each time the cursor could be displayed */
static int scroll_cursor_func(DisplayState *ds,
int offset1, int offset2,
- __unused__ int line_num,
- __unused__ int x, int y,
- __unused__ int w, int h,
- __unused__ int hex_mode)
+ qe__unused__ int line_num,
+ qe__unused__ int x, int y,
+ qe__unused__ int w, int h,
+ qe__unused__ int hex_mode)
{
ScrollContext *m = ds->cursor_opaque;
int y1;
@@ -1209,11 +1209,11 @@
} LeftRightMoveContext;
static int left_right_cursor_func(DisplayState *ds,
- int offset1, __unused__ int offset2,
+ int offset1, qe__unused__ int offset2,
int line_num,
- int x, __unused__ int y,
- __unused__ int w, __unused__ int h,
- __unused__ int hex_mode)
+ int x, qe__unused__ int y,
+ qe__unused__ int w, qe__unused__ int h,
+ qe__unused__ int hex_mode)
{
int d;
LeftRightMoveContext *m = ds->cursor_opaque;
@@ -1325,8 +1325,8 @@
/* XXX: would need two passes in the general case (first search line,
then colunm */
static int mouse_goto_func(DisplayState *ds,
- int offset1, __unused__ int offset2,
- __unused__ int line_num,
+ int offset1, qe__unused__ int offset2,
+ qe__unused__ int line_num,
int x, int y, int w, int h, int hex_mode)
{
MouseGotoContext *m = ds->cursor_opaque;
@@ -1703,7 +1703,7 @@
return b;
}
-void do_append_next_kill(__unused__ EditState *s)
+void do_append_next_kill(qe__unused__ EditState *s)
{
/* do nothing! */
}
@@ -2768,7 +2768,7 @@
}
#endif
-void do_set_display_size(__unused__ EditState *s, int w, int h)
+void do_set_display_size(qe__unused__ EditState *s, int w, int h)
{
if (w != NO_ARG && h != NO_ARG) {
screen_width = w;
@@ -3665,11 +3665,11 @@
}
/* invalidate the colorize data */
-static void colorize_callback(__unused__ EditBuffer *b,
- void *opaque, __unused__ int arg,
- __unused__ enum LogOperation op,
+static void colorize_callback(qe__unused__ EditBuffer *b,
+ void *opaque, qe__unused__ int arg,
+ qe__unused__ enum LogOperation op,
int offset,
- __unused__ int size)
+ qe__unused__ int size)
{
EditState *e = opaque;
@@ -4069,8 +4069,8 @@
- void (*)(EditState *, const char *, const char *, const char *); (2)
- void (*)(EditState *, const char *, const char *, int); (2)
*/
-void call_func(CmdSig sig, CmdProto func, __unused__ int nb_args,
- CmdArg *args, __unused__ unsigned char *args_type)
+void call_func(CmdSig sig, CmdProto func, qe__unused__ int nb_args,
+ CmdArg *args, qe__unused__ unsigned char *args_type)
{
switch (sig) {
case CMD_void:
@@ -4611,7 +4611,7 @@
}
}
-void do_execute_macro_keys(__unused__ EditState *s, const char *keys)
+void do_execute_macro_keys(qe__unused__ EditState *s, const char *keys)
{
QEmacsState *qs = s->qe_state;
const char *p;
@@ -4738,7 +4738,7 @@
qs->macro_keys[qs->nb_macro_keys++] = key;
}
-void do_numeric_argument(__unused__ EditState *s)
+void do_numeric_argument(qe__unused__ EditState *s)
{
/* nothing is done there (see qe_key_process()) */
}
@@ -5031,7 +5031,7 @@
}
}
-void put_error(__unused__ EditState *s, const char *fmt, ...)
+void put_error(qe__unused__ EditState *s, const char *fmt, ...)
{
/* CG: s is not used and may be NULL! */
QEmacsState *qs = &qe_state;
@@ -5045,7 +5045,7 @@
eb_format_message(qs, "*errors*", buf);
}
-void put_status(__unused__ EditState *s, const char *fmt, ...)
+void put_status(qe__unused__ EditState *s, const char *fmt, ...)
{
/* CG: s is not used and may be NULL! */
QEmacsState *qs = &qe_state;
@@ -5584,7 +5584,7 @@
}
/* scroll in completion popup */
-void minibuf_complete_scroll_up_down(__unused__ EditState *s, int dir)
+void minibuf_complete_scroll_up_down(qe__unused__ EditState *s, int dir)
{
if (completion_popup_window) {
completion_popup_window->force_highlight = 1;
@@ -6676,7 +6676,7 @@
quit_examine_buffers(is);
}
-static void quit_confirm_cb(__unused__ void *opaque, char *reply)
+static void quit_confirm_cb(qe__unused__ void *opaque, char *reply)
{
if (!reply)
return;
@@ -6714,7 +6714,7 @@
}
/* refresh the screen, s1 can be any edit window */
-void do_refresh(__unused__ EditState *s1)
+void do_refresh(qe__unused__ EditState *s1)
{
/* CG: s1 may be NULL */
QEmacsState *qs = &qe_state;
@@ -7120,7 +7120,7 @@
return b;
}
-void do_help_for_help(__unused__ EditState *s)
+void do_help_for_help(qe__unused__ EditState *s)
{
EditBuffer *b;
int show;
@@ -7152,11 +7152,11 @@
/* we install a signal handler to set poll_flag to one so that we can
avoid polling too often in some cases */
-int __fast_test_event_poll_flag = 0;
+int qe__fast_test_event_poll_flag = 0;
-static void poll_action(__unused__ int sig)
+static void poll_action(qe__unused__ int sig)
{
- __fast_test_event_poll_flag = 1;
+ qe__fast_test_event_poll_flag = 1;
}
/* init event system */
@@ -7177,7 +7177,7 @@
}
/* see also qe_fast_test_event() */
-int __is_user_input_pending(void)
+int qe__is_user_input_pending(void)
{
QEditScreen *s = &global_screen;
return s->dpy.dpy_is_user_input_pending(s);
@@ -7275,7 +7275,7 @@
static EditState *motion_target;
static int motion_x, motion_y;
-static int check_motion_target(__unused__ EditState *s)
+static int check_motion_target(qe__unused__ EditState *s)
{
QEmacsState *qs = &qe_state;
EditState *e;
@@ -7526,8 +7526,8 @@
}
#endif
-static int text_mode_probe(__unused__ ModeDef *mode,
- __unused__ ModeProbeData *p)
+static int text_mode_probe(qe__unused__ ModeDef *mode,
+ qe__unused__ ModeProbeData *p)
{
if (mode->extensions) {
if (match_extension(p->filename, mode->extensions))
@@ -7870,7 +7870,7 @@
int (*initcall)(void);
int (**ptr)(void);
- ptr = (int (**)(void))(void *)&__initcall_first;
+ ptr = (int (**)(void))(void *)&qe__initcall_first;
for (;;) {
#if defined(__BOUNDS_CHECKING_ON)
/* NOTE: if bound checking is on, a NULL is inserted between
@@ -7892,7 +7892,7 @@
int (*exitcall)(void);
int (**ptr)(void);
- ptr = (int (**)(void))(void *)&__exitcall_first;
+ ptr = (int (**)(void))(void *)&qe__exitcall_first;
for (;;) {
#if defined(__BOUNDS_CHECKING_ON)
/* NOTE: if bound checking is on, a NULL is inserted between
Index: qe.h
===================================================================
RCS file: /sources/qemacs/qemacs/qe.h,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -b -r1.210 -r1.211
--- qe.h 16 Sep 2015 21:44:12 -0000 1.210
+++ qe.h 16 Sep 2015 22:18:24 -0000 1.211
@@ -50,29 +50,17 @@
#if (defined(__GNUC__) || defined(__TINYC__))
/* make sure that the keyword is not disabled by glibc (TINYC case) */
-#undef __attribute__
-#define __attr_printf(a, b) __attribute__((format(printf, a, b)))
+#define qe__attr_printf(a, b) __attribute__((format(printf, a, b)))
#else
-#ifndef __attribute__
-#define __attribute__(l)
-#endif
-#define __attr_printf(a, b)
+#define qe__attr_printf(a, b)
#endif
#if defined(__GNUC__) && __GNUC__ > 2
-#define __attr_nonnull(l) __attribute__((nonnull l))
-#define __unused__ __attribute__((unused))
-#else
-#define __attr_nonnull(l)
-#define __unused__
-#endif
-
-#ifdef __SPARSE__
-#define __bitwise__ __attribute__((bitwise))
-#define force_cast(type, expr) ((__attribute__((force))type)(expr))
+#define qe__attr_nonnull(l) __attribute__((nonnull l))
+#define qe__unused__ __attribute__((unused))
#else
-#define __bitwise__
-#define force_cast(type, expr) ((type)(expr))
+#define qe__attr_nonnull(l)
+#define qe__unused__
#endif
#ifndef offsetof
@@ -426,7 +414,7 @@
int qmemcat(QString *q, const u8 *data1, int len1);
int qstrcat(QString *q, const char *str);
-int qprintf(QString *q, const char *fmt, ...) __attr_printf(2,3);
+int qprintf(QString *q, const char *fmt, ...) qe__attr_printf(2,3);
/* Dynamic buffers with static allocation */
typedef struct buf_t buf_t;
@@ -469,7 +457,7 @@
return buf_write(bp, str, strlen(str));
}
-int buf_printf(buf_t *bp, const char *fmt, ...) __attr_printf(2,3);
+int buf_printf(buf_t *bp, const char *fmt, ...) qe__attr_printf(2,3);
int buf_putc_utf8(buf_t *bp, int c);
/* command line option */
@@ -992,9 +980,9 @@
EditState *eb_find_window(EditBuffer *b, EditState *e);
void eb_set_charset(EditBuffer *b, QECharset *charset, EOLType eol_type);
-__attr_nonnull((3))
+qe__attr_nonnull((3))
int eb_nextc(EditBuffer *b, int offset, int *next_ptr);
-__attr_nonnull((3))
+qe__attr_nonnull((3))
int eb_prevc(EditBuffer *b, int offset, int *prev_ptr);
int eb_skip_chars(EditBuffer *b, int offset, int n);
int eb_delete_chars(EditBuffer *b, int offset, int n);
@@ -1039,7 +1027,7 @@
int eb_match_uchar(EditBuffer *b, int offset, int c, int *offsetp);
int eb_match_str(EditBuffer *b, int offset, const char *str, int *offsetp);
int eb_match_istr(EditBuffer *b, int offset, const char *str, int *offsetp);
-int eb_printf(EditBuffer *b, const char *fmt, ...) __attr_printf(2,3);
+int eb_printf(EditBuffer *b, const char *fmt, ...) qe__attr_printf(2,3);
int eb_puts(EditBuffer *b, const char *s);
int eb_putc(EditBuffer *b, int c);
void eb_line_pad(EditBuffer *b, int n);
@@ -1081,34 +1069,33 @@
/* dynamic module case */
#define qe_module_init(fn) \
- int __qe_module_init(void) { return fn(); }
+ int qe__module_init(void) { return fn(); }
#define qe_module_exit(fn) \
- void __qe_module_exit(void) { fn(); }
+ void qe__module_exit(void) { fn(); }
#else /* QE_MODULE */
#if (defined(__GNUC__) || defined(__TINYC__)) && defined(CONFIG_INIT_CALLS)
#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
/* same method as the linux kernel... */
-#define __init_call __attribute__((unused, __section__ (".initcall.init")))
-#define __exit_call __attribute__((unused, __section__ (".exitcall.exit")))
+#define qe__init_call __attribute__((unused, __section__ (".initcall.init")))
+#define qe__exit_call __attribute__((unused, __section__ (".exitcall.exit")))
#else
-#undef __attribute_used__
-#define __attribute_used__ __attribute__((__used__))
-#define __init_call __attribute_used__ __attribute__((__section__
(".initcall.init")))
-#define __exit_call __attribute_used__ __attribute__((__section__
(".exitcall.exit")))
+#define qe__attr_used __attribute__((__used__))
+#define qe__init_call qe__attr_used __attribute__((__section__
(".initcall.init")))
+#define qe__exit_call qe__attr_used __attribute__((__section__
(".exitcall.exit")))
#endif
#define qe_module_init(fn) \
- static int (*__initcall_##fn)(void) __init_call = fn
+ static int (*qe__initcall_##fn)(void) qe__init_call = fn
#define qe_module_exit(fn) \
- static void (*__exitcall_##fn)(void) __exit_call = fn
+ static void (*qe__exitcall_##fn)(void) qe__exit_call = fn
#else
-#define __init_call
-#define __exit_call
+#define qe__init_call
+#define qe__exit_call
#define qe_module_init(fn) \
extern int module_ ## fn (void); \
@@ -1666,7 +1653,7 @@
void display_eol(DisplayState *s, int offset1, int offset2);
void display_printf(DisplayState *ds, int offset1, int offset2,
- const char *fmt, ...) __attr_printf(4,5);
+ const char *fmt, ...) qe__attr_printf(4,5);
void display_printhex(DisplayState *s, int offset1, int offset2,
unsigned int h, int n);
@@ -1755,8 +1742,8 @@
void complete_test(CompleteState *cp, const char *str);
void register_completion(const char *name, CompletionFunc completion_func);
-void put_status(EditState *s, const char *fmt, ...) __attr_printf(2,3);
-void put_error(EditState *s, const char *fmt, ...) __attr_printf(2,3);
+void put_status(EditState *s, const char *fmt, ...) qe__attr_printf(2,3);
+void put_error(EditState *s, const char *fmt, ...) qe__attr_printf(2,3);
void minibuffer_edit(const char *input, const char *prompt,
StringArray *hist, CompletionFunc completion_func,
void (*cb)(void *opaque, char *buf), void *opaque);
@@ -1769,13 +1756,13 @@
return 0;
}
#else
-extern int __fast_test_event_poll_flag;
-int __is_user_input_pending(void);
+extern int qe__fast_test_event_poll_flag;
+int qe__is_user_input_pending(void);
static inline int is_user_input_pending(void) {
- if (__fast_test_event_poll_flag) {
- __fast_test_event_poll_flag = 0;
- return __is_user_input_pending();
+ if (qe__fast_test_event_poll_flag) {
+ qe__fast_test_event_poll_flag = 0;
+ return qe__is_user_input_pending();
} else {
return 0;
}
Index: qeend.c
===================================================================
RCS file: /sources/qemacs/qemacs/qeend.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- qeend.c 3 Dec 2007 16:10:39 -0000 1.3
+++ qeend.c 16 Sep 2015 22:18:25 -0000 1.4
@@ -24,8 +24,7 @@
#ifdef CONFIG_INIT_CALLS
/* add empty pointers at the end of init and cleanup sections */
-static int (*__initcall_end)(void) __init_call = NULL;
-
-static void (*__exitcall_end)(void) __exit_call = NULL;
+static int (*qe__initcall_end)(void) qe__init_call = NULL;
+static void (*qe__exitcall_end)(void) qe__exit_call = NULL;
#endif
Index: search.c
===================================================================
RCS file: /sources/qemacs/qemacs/search.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- search.c 26 Aug 2015 23:13:36 -0000 1.4
+++ search.c 16 Sep 2015 22:18:25 -0000 1.5
@@ -177,7 +177,7 @@
}
}
-static int search_abort_func(__unused__ void *opaque)
+static int search_abort_func(qe__unused__ void *opaque)
{
return is_user_input_pending();
}
Index: shell.c
===================================================================
RCS file: /sources/qemacs/qemacs/shell.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- shell.c 27 Aug 2015 23:03:40 -0000 1.102
+++ shell.c 16 Sep 2015 22:18:25 -0000 1.103
@@ -636,7 +636,7 @@
/* Well, almost a hack to update cursor */
-static void tty_update_cursor(__unused__ ShellState *s)
+static void tty_update_cursor(qe__unused__ ShellState *s)
{
#if 0
QEmacsState *qs = s->qe_state;
Index: tty.c
===================================================================
RCS file: /sources/qemacs/qemacs/tty.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- tty.c 16 Sep 2015 12:35:01 -0000 1.68
+++ tty.c 16 Sep 2015 22:18:25 -0000 1.69
@@ -119,7 +119,7 @@
}
static int tty_term_init(QEditScreen *s,
- __unused__ int w, __unused__ int h)
+ qe__unused__ int w, qe__unused__ int h)
{
TTYState *ts;
struct termios tty;
@@ -285,7 +285,7 @@
tcsetattr(fileno(s->STDIN), TCSANOW, &ts->oldtty);
}
-static void tty_resize(__unused__ int sig)
+static void tty_resize(qe__unused__ int sig)
{
QEditScreen *s = tty_screen;
TTYState *ts = s->priv_data;
@@ -335,7 +335,7 @@
}
static void tty_term_cursor_at(QEditScreen *s, int x1, int y1,
- __unused__ int w, __unused__ int h)
+ qe__unused__ int w, qe__unused__ int h)
{
TTYState *ts = s->priv_data;
ts->cursor_x = x1;
@@ -1003,8 +1003,8 @@
}
/* XXX: could alloc font in wrapper */
-static QEFont *tty_term_open_font(__unused__ QEditScreen *s,
- __unused__ int style, __unused__ int size)
+static QEFont *tty_term_open_font(qe__unused__ QEditScreen *s,
+ qe__unused__ int style, qe__unused__ int
size)
{
QEFont *font;
@@ -1018,12 +1018,12 @@
return font;
}
-static void tty_term_close_font(__unused__ QEditScreen *s, QEFont **fontp)
+static void tty_term_close_font(qe__unused__ QEditScreen *s, QEFont **fontp)
{
qe_free(fontp);
}
-static inline int tty_term_glyph_width(__unused__ QEditScreen *s, unsigned int
ucs)
+static inline int tty_term_glyph_width(qe__unused__ QEditScreen *s, unsigned
int ucs)
{
/* XXX: should support combining marks */
@@ -1034,7 +1034,7 @@
return unicode_glyph_tty_width(ucs);
}
-static void tty_term_text_metrics(QEditScreen *s, __unused__ QEFont *font,
+static void tty_term_text_metrics(QEditScreen *s, qe__unused__ QEFont *font,
QECharMetrics *metrics,
const unsigned int *str, int len)
{
@@ -1049,7 +1049,7 @@
metrics->width = x;
}
-static void tty_term_draw_text(QEditScreen *s, __unused__ QEFont *font,
+static void tty_term_draw_text(QEditScreen *s, qe__unused__ QEFont *font,
int x, int y, const unsigned int *str, int len,
QEColor color)
{
@@ -1108,9 +1108,9 @@
}
}
-static void tty_term_set_clip(__unused__ QEditScreen *s,
- __unused__ int x, __unused__ int y,
- __unused__ int w, __unused__ int h)
+static void tty_term_set_clip(qe__unused__ QEditScreen *s,
+ qe__unused__ int x, qe__unused__ int y,
+ qe__unused__ int w, qe__unused__ int h)
{
}
Index: unix.c
===================================================================
RCS file: /sources/qemacs/qemacs/unix.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- unix.c 4 Mar 2014 00:39:30 -0000 1.9
+++ unix.c 16 Sep 2015 22:18:25 -0000 1.10
@@ -184,7 +184,7 @@
}
/* execute stacked bottom halves */
-static void __call_bottom_halves(void)
+static void qe__call_bottom_halves(void)
{
BottomHalfEntry *bh;
@@ -199,7 +199,7 @@
static inline void call_bottom_halves(void)
{
if (!list_empty(&bottom_halves))
- __call_bottom_halves();
+ qe__call_bottom_halves();
}
/* call timer callbacks and compute maximum next call time to
Index: x11.c
===================================================================
RCS file: /sources/qemacs/qemacs/x11.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- x11.c 27 Aug 2015 23:03:42 -0000 1.37
+++ x11.c 16 Sep 2015 22:18:25 -0000 1.38
@@ -162,8 +162,8 @@
}
#else
-static inline void update_rect(__unused__ int x1, __unused__ int y1,
- __unused__ int x2, __unused__ int y2)
+static inline void update_rect(qe__unused__ int x1, qe__unused__ int y1,
+ qe__unused__ int x2, qe__unused__ int y2)
{
}
#endif
@@ -433,7 +433,7 @@
}
#endif
-static void term_close(__unused__ QEditScreen *s)
+static void term_close(qe__unused__ QEditScreen *s)
{
#ifdef CONFIG_DOUBLE_BUFFER
XFreePixmap(display, dbuffer);
@@ -483,7 +483,7 @@
}
}
-static void xor_rectangle(__unused__ QEditScreen *s,
+static void xor_rectangle(qe__unused__ QEditScreen *s,
int x, int y, int w, int h)
{
int fg;
@@ -662,7 +662,7 @@
}
-static QEFont *term_open_font(__unused__ QEditScreen *s, int style, int size)
+static QEFont *term_open_font(qe__unused__ QEditScreen *s, int style, int size)
{
char family[128];
const char *family_list, *p1;
@@ -780,7 +780,7 @@
return NULL;
}
-static void term_close_font(__unused__ QEditScreen *s, QEFont **fontp)
+static void term_close_font(qe__unused__ QEditScreen *s, QEFont **fontp)
{
if (*fontp) {
QEFont *font = *fontp;
@@ -986,7 +986,7 @@
}
#endif
-static void term_set_clip(__unused__ QEditScreen *s,
+static void term_set_clip(qe__unused__ QEditScreen *s,
int x, int y, int w, int h)
{
XRectangle rect;
@@ -998,7 +998,7 @@
XSetClipRectangles(display, gc, 0, 0, &rect, 1, YXSorted);
}
-static void term_flush(__unused__ QEditScreen *s)
+static void term_flush(qe__unused__ QEditScreen *s)
{
#ifdef CONFIG_DOUBLE_BUFFER
CSSRect *r;
@@ -1034,7 +1034,7 @@
#endif
}
-static void x11_full_screen(__unused__ QEditScreen *s, int full_screen)
+static void x11_full_screen(qe__unused__ QEditScreen *s, int full_screen)
{
XWindowAttributes attr1;
Window win;
@@ -1059,21 +1059,21 @@
}
}
-static void term_selection_activate(__unused__ QEditScreen *s)
+static void term_selection_activate(qe__unused__ QEditScreen *s)
{
/* own selection from now */
XSetSelectionOwner(display, XA_PRIMARY, window, CurrentTime);
}
-static Bool test_event(__unused__ Display *dpy, XEvent *ev,
- __unused__ char *arg)
+static Bool test_event(qe__unused__ Display *dpy, XEvent *ev,
+ qe__unused__ char *arg)
{
return (ev->type == SelectionNotify);
}
/* request the selection from the GUI and put it in a new yank buffer
if needed */
-static void term_selection_request(__unused__ QEditScreen *s)
+static void term_selection_request(qe__unused__ QEditScreen *s)
{
QEmacsState *qs = &qe_state;
Window w;
@@ -1216,7 +1216,7 @@
}
/* fast test to see if the user pressed a key or a mouse button */
-static int x11_is_user_input_pending(__unused__ QEditScreen *s)
+static int x11_is_user_input_pending(qe__unused__ QEditScreen *s)
{
XEvent xev;
@@ -1651,7 +1651,7 @@
return -1;
}
-static void x11_bmp_free(__unused__ QEditScreen *s, QEBitmap *b)
+static void x11_bmp_free(qe__unused__ QEditScreen *s, QEBitmap *b)
{
X11Bitmap *xb = b->priv_data;
@@ -1687,10 +1687,10 @@
qe_free(&b->priv_data);
}
-static void x11_bmp_draw(__unused__ QEditScreen *s, QEBitmap *b,
+static void x11_bmp_draw(qe__unused__ QEditScreen *s, QEBitmap *b,
int dst_x, int dst_y, int dst_w, int dst_h,
- __unused__ int offset_x, __unused__ int offset_y,
- __unused__ int flags)
+ qe__unused__ int offset_x, qe__unused__ int offset_y,
+ qe__unused__ int flags)
{
X11Bitmap *xb = b->priv_data;
@@ -1728,7 +1728,7 @@
}
}
-static void x11_bmp_lock(__unused__ QEditScreen *s, QEBitmap *b, QEPicture
*pict,
+static void x11_bmp_lock(qe__unused__ QEditScreen *s, QEBitmap *b, QEPicture
*pict,
int x1, int y1, int w1, int h1)
{
X11Bitmap *xb = b->priv_data;
@@ -1785,7 +1785,7 @@
}
}
-static void x11_bmp_unlock(__unused__ QEditScreen *s, QEBitmap *b)
+static void x11_bmp_unlock(qe__unused__ QEditScreen *s, QEBitmap *b)
{
X11Bitmap *xb = b->priv_data;
int ret;
Index: libqhtml/css.c
===================================================================
RCS file: /sources/qemacs/qemacs/libqhtml/css.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- libqhtml/css.c 30 Aug 2015 11:27:12 -0000 1.27
+++ libqhtml/css.c 16 Sep 2015 22:18:25 -0000 1.28
@@ -438,7 +438,7 @@
CSSState *state,
CSSProperty *p,
CSSState *state_parent,
- __unused__ CSSBox *box)
+ qe__unused__ CSSBox *box)
{
CSSPropertyDef const *def;
CSSPropertyStorage *ptr, *parent_ptr;
@@ -4055,7 +4055,7 @@
}
static void css_display_block(CSSContext *s,
- CSSBox *box, __unused__ CSSState *props_parent,
+ CSSBox *box, qe__unused__ CSSState *props_parent,
CSSRect *clip_box, int dx, int dy)
{
CSSState *props;
Index: libqhtml/cssparse.c
===================================================================
RCS file: /sources/qemacs/qemacs/libqhtml/cssparse.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- libqhtml/cssparse.c 23 Jan 2014 12:56:24 -0000 1.20
+++ libqhtml/cssparse.c 16 Sep 2015 22:18:25 -0000 1.21
@@ -45,7 +45,7 @@
#include <assert.h>
static void css_error1(CSSParseState *b, const char *fmt, ...)
- __attr_printf(2,3);
+ qe__attr_printf(2,3);
static void css_error1(CSSParseState *b, const char *fmt, ...)
{
Index: libqhtml/xmlparse.c
===================================================================
RCS file: /sources/qemacs/qemacs/libqhtml/xmlparse.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- libqhtml/xmlparse.c 19 Aug 2015 14:26:34 -0000 1.27
+++ libqhtml/xmlparse.c 16 Sep 2015 22:18:26 -0000 1.28
@@ -788,7 +788,7 @@
}
static void xml_error(XMLState *s, const char *fmt, ...)
- __attr_printf(2,3);
+ qe__attr_printf(2,3);
static void xml_error(XMLState *s, const char *fmt, ...)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemacs-commit] qemacs .cvsignore arabic.c buffer.c cfb.c chars...,
Charlie Gordon <=