Drop attr_* defines

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>

diff --git a/src/dumpkeys.c b/src/dumpkeys.c
index d5efc3b..bbc9063 100644 (file)
--- a/src/dumpkeys.c
+++ b/src/dumpkeys.c
@@ -24,7 +24,7 @@
 static int fd;
 static int verbose;
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(void) {
        fprintf(stderr, _("dumpkeys version %s"), PACKAGE_VERSION);
        fprintf(stderr, _("\

diff --git a/src/fgconsole.c b/src/fgconsole.c
index 268bfda..d4a2e23 100644 (file)
--- a/src/fgconsole.c
+++ b/src/fgconsole.c
@@ -11,7 +11,7 @@
 #include "nls.h"
 #include "version.h"
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(void)
 {
        fprintf(stderr, _("%s version %s\n"

diff --git a/src/getkeycodes.c b/src/getkeycodes.c
index 9d6fad6..d1fccf9 100644 (file)
--- a/src/getkeycodes.c
+++ b/src/getkeycodes.c
@@ -13,7 +13,7 @@
 #include "nls.h"
 #include "version.h"
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(void) {
     fprintf(stderr, _("usage: getkeycodes\n"));
     exit(1);

diff --git a/src/getunimap.c b/src/getunimap.c
index e36326d..5e7b8fb 100644 (file)
--- a/src/getunimap.c
+++ b/src/getunimap.c
@@ -24,7 +24,7 @@ ud_compar(const void *u1, const void *u2){
        return (int) fp1 - (int) fp2;
 }
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(void) {
        fprintf(stderr, _("Usage:\n\t%s [-s] [-C console]\n"), progname);
        exit(1);

diff --git a/src/kbd.h b/src/kbd.h
index b0aae41..102a475 100644 (file)
--- a/src/kbd.h
+++ b/src/kbd.h
@@ -1,8 +1,8 @@
 #ifndef _KBD_H
 #define _KBD_H
 
-#define attr_noreturn __attribute__ ((noreturn))
-#define attr_unused __attribute__ ((unused))
-#define attr_fmt45 __attribute__ ((format (printf, 4, 5)))
+#ifndef __GNUC__
+#  define  __attribute__(x)  /*NOTHING*/
+#endif
 
 #endif /* _KBD_H */

diff --git a/src/kbd_mode.c b/src/kbd_mode.c
index 991df8d..7d979a1 100644 (file)
--- a/src/kbd_mode.c
+++ b/src/kbd_mode.c
@@ -15,7 +15,7 @@
 #include "nls.h"
 #include "version.h"
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(void){
     fprintf(stderr, _("usage: kbd_mode [-a|-u|-k|-s] [-C device]\n"));
     exit(1);

diff --git a/src/kbdinfo.c b/src/kbdinfo.c
index 615cfee..e5f122d 100644 (file)
--- a/src/kbdinfo.c
+++ b/src/kbdinfo.c
@@ -12,7 +12,7 @@
 static const char *action = NULL;
 static const char *value  = NULL;
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(int code) {
        fprintf(stderr,
                _("Usage: %1$s [-C DEVICE] getmode [text|graphics]\n"

diff --git a/src/kbdrate.c b/src/kbdrate.c
index 8d0df5a..2ab8388 100644 (file)
--- a/src/kbdrate.c
+++ b/src/kbdrate.c
@@ -178,7 +178,7 @@ KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
 }
 
 #ifndef KIOCSRATE
-#define arg_state attr_unused
+#define arg_state __attribute__ ((unused))
 #else
 #define arg_state
 #endif
@@ -217,7 +217,7 @@ KIOCSRATE_ioctl_ok(arg_state double rate, arg_state int delay, arg_state int sil
 }
 
 static void
-sigalrmhandler( attr_unused int sig ) {
+sigalrmhandler(int sig __attribute__ ((unused))) {
        fprintf( stderr, "kbdrate: Failed waiting for kbd controller!\n" );
        raise( SIGINT );
 }

diff --git a/src/libkeymap/parser.y b/src/libkeymap/parser.y
index 3a4aa18..fbeab1e 100644 (file)
--- a/src/libkeymap/parser.y
+++ b/src/libkeymap/parser.y
@@ -69,7 +69,8 @@ struct strdata {
 
 %{
 static int
-yyerror(yyscan_t scanner attr_unused, struct keymap *kmap, const char *s)
+yyerror(yyscan_t scanner __attribute__ ((unused)),
+        struct keymap *kmap, const char *s)
 {
        ERR(kmap, "%s", s);
        return 0;

diff --git a/src/loadkeys.c b/src/loadkeys.c
index 86b0f78..4e6372d 100644 (file)
--- a/src/loadkeys.c
+++ b/src/loadkeys.c
@@ -29,7 +29,7 @@ static const char *progname = NULL;
 static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
 static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(void)
 {
        fprintf(stderr, _("loadkeys version %s\n"

diff --git a/src/loadunimap.c b/src/loadunimap.c
index dba4cb4..a3b9eea 100644 (file)
--- a/src/loadunimap.c
+++ b/src/loadunimap.c
@@ -37,7 +37,7 @@ int verbose = 0;
 int force = 0;
 int debug = 0;
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(void) {
         fprintf(stderr,
                _("Usage:\n\t%s [-C console] [-o map.orig]\n"), progname);

diff --git a/src/mapscrn.c b/src/mapscrn.c
index 1088912..8472e2f 100644 (file)
--- a/src/mapscrn.c
+++ b/src/mapscrn.c
@@ -123,7 +123,7 @@ parsemap(FILE *fp, char *buf, unsigned short *ubuf, int *u, int *lineno) {
 }
 
 static int
-readnewmapfromfile(attr_unused int fd, char *mfil, char *buf, unsigned short *ubuf) {
+readnewmapfromfile(char *mfil, char *buf, unsigned short *ubuf) {
        struct stat stbuf;
        int u = 0;
        int lineno = 0;
@@ -192,7 +192,7 @@ loadnewmap(int fd, char *mfil) {
 
        u = 0;
        if (mfil)
-               u = readnewmapfromfile(fd, mfil, buf, ubuf);
+               u = readnewmapfromfile(mfil, buf, ubuf);
 
        /* do we need to use loaduniscrnmap() ? */
        if (u) {

diff --git a/src/outpsfheader.c b/src/outpsfheader.c
index 1083b9f..6c0cbf7 100644 (file)
--- a/src/outpsfheader.c
+++ b/src/outpsfheader.c
@@ -5,7 +5,7 @@
 #include "kbd.h"
 #include "psf.h"
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(void) {
        fprintf(stderr, "call: outpsfheader psftype fontsize charsize hastable\n");
        exit(1);

diff --git a/src/resizecons.c b/src/resizecons.c
index 908d1d9..5f84845 100644 (file)
--- a/src/resizecons.c
+++ b/src/resizecons.c
@@ -331,7 +331,7 @@ main(int argc, char **argv) {
     return 0;
 }
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage() {
     fprintf(stderr,
            _("resizecons:\n"

diff --git a/src/setfont.c b/src/setfont.c
index cfdff95..7422792 100644 (file)
--- a/src/setfont.c
+++ b/src/setfont.c
@@ -67,7 +67,7 @@ findpartialfont(char *fnam, lkfile_t *fp) {
     return lk_findfile(fnam, partfontdirpath, partfontsuffixes, fp);
 }
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(void)
 {
         fprintf(stderr, _(

diff --git a/src/setkeycodes.c b/src/setkeycodes.c
index f48da2a..8607c2a 100644 (file)
--- a/src/setkeycodes.c
+++ b/src/setkeycodes.c
@@ -14,7 +14,7 @@
 #include "nls.h"
 #include "version.h"
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(char *s) {
        fprintf(stderr, "setkeycode: %s\n", s);
        fprintf(stderr, _(

diff --git a/src/setleds.c b/src/setleds.c
index 3577aee..8cba879 100644 (file)
--- a/src/setleds.c
+++ b/src/setleds.c
@@ -14,7 +14,7 @@
 #include "nls.h"
 #include "version.h"
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(void)
 {
     fprintf(stderr, _(
@@ -111,12 +111,12 @@ getflags(char *flags) {
 static int sunkbdfd = -1;
 
 #ifndef KIOCGLED
-#define arg_state attr_unused
+#define arg_state __attribute__ ((unused))
 #else
 #define arg_state
 #endif
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 sungetleds(arg_state char *cur_leds) {
 #ifdef KIOCGLED
     if (ioctl(sunkbdfd, KIOCGLED, cur_leds)) {
@@ -132,12 +132,12 @@ sungetleds(arg_state char *cur_leds) {
 }
 
 #ifndef KIOCSLED
-#define arg_state attr_unused
+#define arg_state __attribute__ ((unused))
 #else
 #define arg_state
 #endif
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 sunsetleds(arg_state char *cur_leds) {
 #ifdef KIOCSLED
     if (ioctl(sunkbdfd, KIOCSLED, cur_leds)) {

diff --git a/src/setmetamode.c b/src/setmetamode.c
index 1d927b0..353dd62 100644 (file)
--- a/src/setmetamode.c
+++ b/src/setmetamode.c
@@ -13,7 +13,7 @@
 #include "nls.h"
 #include "version.h"
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(void)
 {
     fprintf(stderr, _(

diff --git a/src/setvtrgb.c b/src/setvtrgb.c
index 1dc923a..f99badc 100644 (file)
--- a/src/setvtrgb.c
+++ b/src/setvtrgb.c
@@ -35,7 +35,7 @@ unsigned char vga_colors[] = {
        0xff, 0xff, 0xff,
 };
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(int code)
 {
        fprintf(stderr,

diff --git a/src/showconsolefont.c b/src/showconsolefont.c
index 733e634..fb7ca6f 100644 (file)
--- a/src/showconsolefont.c
+++ b/src/showconsolefont.c
@@ -26,7 +26,7 @@ int fd = 0;
 int have_obuf = 0;
 int have_ounimap = 0;
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 leave(int n) {
        if (have_obuf && loaduniscrnmap(fd,obuf)) {
                fprintf(stderr,
@@ -58,7 +58,7 @@ settrivialscreenmap(void) {
        }
 }
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 out_of_memory(void) {
        fprintf(stderr, _("%s: out of memory?\n"), progname);
        leave(1);
@@ -98,7 +98,7 @@ setnewunicodemap(int *list, int cnt) {
                leave(1);
 }
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(void) {
        fprintf(stderr,
                _("usage: showconsolefont -V|--version\n"

diff --git a/src/showkey.c b/src/showkey.c
index 988238a..1c8f90f 100644 (file)
--- a/src/showkey.c
+++ b/src/showkey.c
@@ -60,20 +60,20 @@ clean_up(void) {
        close(fd);
 }
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 die(int x) {
        printf(_("caught signal %d, cleaning up...\n"), x);
        clean_up();
        exit(1);
 }
 
-static void attr_noreturn
-watch_dog(attr_unused int x) {
+static void __attribute__ ((noreturn))
+watch_dog(int x __attribute__ ((unused))) {
        clean_up();
        exit(0);
 }
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 usage(void) {
        fprintf(stderr, _(
 "showkey version %s\n\n"

diff --git a/src/spawn_console.c b/src/spawn_console.c
index 61e3475..14d7df9 100644 (file)
--- a/src/spawn_console.c
+++ b/src/spawn_console.c
@@ -21,7 +21,7 @@
 #include "kbd.h"
 
 static void
-sighup(attr_unused int n) {
+sighup(int n __attribute__ ((unused))) {
     if (system("openvt -s -l bash") == -1) {
       perror("system");
       exit(1);

diff --git a/src/spawn_login.c b/src/spawn_login.c
index cd7c4bd..a2d953b 100644 (file)
--- a/src/spawn_login.c
+++ b/src/spawn_login.c
@@ -16,7 +16,7 @@
 #include "kbd.h"
 
 static void
-sighup(attr_unused int n) {
+sighup(int n __attribute__ ((unused))) {
     if (system("openvt -s -l -- login -h spawn") == -1) {
        perror("system");
        exit(1);

diff --git a/src/version.h b/src/version.h
index 39c78ee..29e974f 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -15,7 +15,7 @@ set_progname(char *name) {
        progname = (p ? p+1 : name);
 }
 
-static inline void attr_noreturn
+static inline void __attribute__ ((noreturn))
 print_version_and_exit(void) {
        printf(_("%s from %s\n"), progname, PACKAGE_STRING);
        exit(0);

diff --git a/src/xmalloc.c b/src/xmalloc.c
index e470164..9df5d7f 100644 (file)
--- a/src/xmalloc.c
+++ b/src/xmalloc.c
@@ -10,7 +10,7 @@
 
 extern char *progname;
 
-static void attr_noreturn
+static void __attribute__ ((noreturn))
 nomem(void) {
        fprintf(stderr, _("%s: out of memory\n"), progname);
        exit(EX_OSERR);