Merge master

[netatalk.git] / etc / afpd / icon.h

diff --git a/etc/afpd/icon.h b/etc/afpd/icon.h
index 2cc2dcd51702283971b135965c0b5fbd07e7b0f6..c26b6fd63e4e56cc647155f9f47e850a0274523f 100644 (file)
--- a/etc/afpd/icon.h
+++ b/etc/afpd/icon.h
@@ -1,6 +1,4 @@
 /*
- * $Id: icon.h,v 1.3 2001-12-03 05:03:38 jmarcus Exp $
- *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  */
@@ -8,10 +6,9 @@
 #ifndef AFPD_ICON_H
 #define AFPD_ICON_H 1
 
-#include <sys/cdefs.h>
-#include "globals.h"
+#include <atalk/globals.h>
 
-const unsigned char apple_atalk_icon[] = { /* default appletalk icon */
+static const unsigned char apple_atalk_icon[] = { /* default appletalk icon */
     0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
     0x00,  0x01,  0x00,  0x00,  0x00,  0x02,  0x9F,  0xE0,
     0x00,  0x04,  0x50,  0x30,  0x00,  0x08,  0x30,  0x28,
@@ -46,7 +43,7 @@ const unsigned char apple_atalk_icon[] = { /* default appletalk icon */
     0xBF,  0xFF,  0xFD,  0xF4,  0xBF,  0xFF,  0xF8,  0xF4
 };
 
-const unsigned char apple_tcp_icon[] = { /* default asip icon */
+static const unsigned char apple_tcp_icon[] = { /* default asip icon */
     0x30,  0x00,  0x8f,  0xf8,  0xcc,  0x01,  0x48,  0x0c,
     0xb3,  0x32,  0x28,  0x0a,  0x8c,  0xcc,  0x7c,  0x0f,
     0x83,  0x02,  0xff,  0x01,  0x80,  0xc3,  0xc3,  0x81,
@@ -82,7 +79,7 @@ const unsigned char apple_tcp_icon[] = { /* default asip icon */
 };
 
 #if defined( ultrix )
-const u_char   icon[] = {      /* declogo */
+static const unsigned char icon[] = { /* declogo */
     0x0, 0x80, 0x0, 0x0, 0x1, 0xC0, 0x0, 0x0,
     0x3, 0xE0, 0x0, 0x0, 0x7, 0xF0, 0x0, 0x0,
     0xF, 0xB0, 0x0, 0x0, 0x13, 0x6C, 0x0, 0x0,
@@ -119,7 +116,7 @@ const u_char        icon[] = {      /* declogo */
 
 #else
 #if defined( vax )
-const u_char   icon[] = {      /* daemon */
+static const unsigned char icon[] = { /* daemon */
     0x0, 0x0, 0x0, 0x0, 0x0, 0x80, 0x2, 0x0,
     0x1, 0x80, 0x3, 0x0, 0x2, 0x80, 0x2, 0x80,
     0x2, 0x80, 0x2, 0x80, 0x4, 0x80, 0x2, 0x40,
@@ -156,7 +153,7 @@ const u_char        icon[] = {      /* daemon */
 
 #else
 #if defined( sun )
-const u_char   icon[] = {      /* sunlogo */
+static const unsigned char icon[] = { /* sunlogo */
     0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x80, 0x0,
     0x0, 0x2, 0x40, 0x0, 0x0, 0x2, 0x20, 0x0,
     0x0, 0x9, 0x10, 0x0, 0x0, 0x4, 0x88, 0x0,
@@ -193,7 +190,7 @@ const u_char        icon[] = {      /* sunlogo */
 
 #else
 #if defined( _IBMR2 )
-const u_char   icon[] = {      /* hagar */
+static const unsigned char icon[] = { /* hagar */
     0x0, 0x0, 0x0, 0x0, 0x18, 0x0, 0x0, 0x18,
     0x24, 0x0, 0x0, 0x24, 0x44, 0x3, 0xC0, 0x22,
     0x44, 0xC, 0x30, 0x22, 0x42, 0x30, 0xC, 0x42,
@@ -229,7 +226,7 @@ const u_char        icon[] = {      /* hagar */
 };
 
 #else
-const u_char   icon[] = {      /* globe */
+static const unsigned char icon[] = { /* globe */
     0x0, 0x0, 0x0, 0x0, 0x0, 0xF, 0xF0, 0x0,
     0x0, 0x30, 0xC, 0x0, 0x0, 0xC0, 0x3, 0x0,
     0x1, 0x80, 0x3, 0x80, 0x3, 0xE2, 0x1F, 0xC0,