From a777ef05f19086f2593fa2248ad53da9e2c43aa3 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Sat, 25 Nov 2006 17:14:36 +0000
Subject: import from X.Org 7.2RC1

---
 lib/libXfont/src/stubs/cauthgen.c     | 4 ----
 lib/libXfont/src/stubs/csignal.c      | 4 ----
 lib/libXfont/src/stubs/delfntcid.c    | 4 ----
 lib/libXfont/src/stubs/errorf.c       | 4 ----
 lib/libXfont/src/stubs/fatalerror.c   | 4 ----
 lib/libXfont/src/stubs/findoldfnt.c   | 4 ----
 lib/libXfont/src/stubs/getcres.c      | 4 ----
 lib/libXfont/src/stubs/getdefptsize.c | 4 ----
 lib/libXfont/src/stubs/getnewfntcid.c | 4 ----
 lib/libXfont/src/stubs/gettime.c      | 4 ----
 lib/libXfont/src/stubs/initfshdl.c    | 4 ----
 lib/libXfont/src/stubs/servclient.c   | 4 ----
 lib/libXfont/src/stubs/setfntauth.c   | 4 ----
 lib/libXfont/src/stubs/stfntcfnt.c    | 4 ----
 14 files changed, 56 deletions(-)

(limited to 'lib/libXfont')

diff --git a/lib/libXfont/src/stubs/cauthgen.c b/lib/libXfont/src/stubs/cauthgen.c
index 026c52d17..06f1a343f 100644
--- a/lib/libXfont/src/stubs/cauthgen.c
+++ b/lib/libXfont/src/stubs/cauthgen.c
@@ -3,10 +3,6 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak client_auth_generation
-#endif
-
 weak int
 client_auth_generation(ClientPtr client)
 {
diff --git a/lib/libXfont/src/stubs/csignal.c b/lib/libXfont/src/stubs/csignal.c
index e6fdeae1b..3e102ccd0 100644
--- a/lib/libXfont/src/stubs/csignal.c
+++ b/lib/libXfont/src/stubs/csignal.c
@@ -3,10 +3,6 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak ClientSignal
-#endif
-
 weak Bool
 ClientSignal(ClientPtr client)
 {
diff --git a/lib/libXfont/src/stubs/delfntcid.c b/lib/libXfont/src/stubs/delfntcid.c
index ca713286c..0b0a747b5 100644
--- a/lib/libXfont/src/stubs/delfntcid.c
+++ b/lib/libXfont/src/stubs/delfntcid.c
@@ -3,10 +3,6 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak DeleteFontClientID
-#endif
-
 weak void
 DeleteFontClientID(Font id)
 {
diff --git a/lib/libXfont/src/stubs/errorf.c b/lib/libXfont/src/stubs/errorf.c
index fd32965a4..28872e2f8 100644
--- a/lib/libXfont/src/stubs/errorf.c
+++ b/lib/libXfont/src/stubs/errorf.c
@@ -3,10 +3,6 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak ErrorF
-#endif
-
 weak void
 ErrorF(const char *f, ...)
 {
diff --git a/lib/libXfont/src/stubs/fatalerror.c b/lib/libXfont/src/stubs/fatalerror.c
index 1549ad3ea..295593ea6 100644
--- a/lib/libXfont/src/stubs/fatalerror.c
+++ b/lib/libXfont/src/stubs/fatalerror.c
@@ -3,10 +3,6 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak FatalError
-#endif
-
 weak void
 FatalError(const char *f, ...)
 {
diff --git a/lib/libXfont/src/stubs/findoldfnt.c b/lib/libXfont/src/stubs/findoldfnt.c
index 7a0008409..22bd8c1d1 100644
--- a/lib/libXfont/src/stubs/findoldfnt.c
+++ b/lib/libXfont/src/stubs/findoldfnt.c
@@ -3,10 +3,6 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak find_old_font
-#endif
-
 weak FontPtr
 find_old_font(FSID id)
 {
diff --git a/lib/libXfont/src/stubs/getcres.c b/lib/libXfont/src/stubs/getcres.c
index 0b98f46e3..b564f24e6 100644
--- a/lib/libXfont/src/stubs/getcres.c
+++ b/lib/libXfont/src/stubs/getcres.c
@@ -3,10 +3,6 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak GetClientResolutions
-#endif
-
 weak FontResolutionPtr
 GetClientResolutions(int *num)
 {
diff --git a/lib/libXfont/src/stubs/getdefptsize.c b/lib/libXfont/src/stubs/getdefptsize.c
index 0b9e40999..11804ddb0 100644
--- a/lib/libXfont/src/stubs/getdefptsize.c
+++ b/lib/libXfont/src/stubs/getdefptsize.c
@@ -3,10 +3,6 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak GetDefaultPointSize
-#endif
-
 weak int
 GetDefaultPointSize(void)
 {
diff --git a/lib/libXfont/src/stubs/getnewfntcid.c b/lib/libXfont/src/stubs/getnewfntcid.c
index e2fe8bb15..aefc55372 100644
--- a/lib/libXfont/src/stubs/getnewfntcid.c
+++ b/lib/libXfont/src/stubs/getnewfntcid.c
@@ -3,10 +3,6 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak GetNewFontClientID
-#endif
-
 weak Font
 GetNewFontClientID(void)
 {
diff --git a/lib/libXfont/src/stubs/gettime.c b/lib/libXfont/src/stubs/gettime.c
index 7b2d3b34c..1aca1cc56 100644
--- a/lib/libXfont/src/stubs/gettime.c
+++ b/lib/libXfont/src/stubs/gettime.c
@@ -3,10 +3,6 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak GetTimeInMillis
-#endif
-
 weak unsigned long
 GetTimeInMillis (void)
 {
diff --git a/lib/libXfont/src/stubs/initfshdl.c b/lib/libXfont/src/stubs/initfshdl.c
index a14dafffc..faee9f64d 100644
--- a/lib/libXfont/src/stubs/initfshdl.c
+++ b/lib/libXfont/src/stubs/initfshdl.c
@@ -3,10 +3,6 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak init_fs_handlers
-#endif
-
 weak int
 init_fs_handlers(FontPathElementPtr fpe,
                  BlockHandlerProcPtr block_handler)
diff --git a/lib/libXfont/src/stubs/servclient.c b/lib/libXfont/src/stubs/servclient.c
index 9b6cebb3f..ae51621bf 100644
--- a/lib/libXfont/src/stubs/servclient.c
+++ b/lib/libXfont/src/stubs/servclient.c
@@ -3,8 +3,4 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak serverClient
-#endif
-
 weak void *serverClient = 0;
diff --git a/lib/libXfont/src/stubs/setfntauth.c b/lib/libXfont/src/stubs/setfntauth.c
index 0c7ecccde..01d18b125 100644
--- a/lib/libXfont/src/stubs/setfntauth.c
+++ b/lib/libXfont/src/stubs/setfntauth.c
@@ -3,10 +3,6 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak set_font_authorizations
-#endif
-
 weak int
 set_font_authorizations(char **authorizations, int *authlen, ClientPtr client)
 {
diff --git a/lib/libXfont/src/stubs/stfntcfnt.c b/lib/libXfont/src/stubs/stfntcfnt.c
index 5fc17452f..bf88505b7 100644
--- a/lib/libXfont/src/stubs/stfntcfnt.c
+++ b/lib/libXfont/src/stubs/stfntcfnt.c
@@ -3,10 +3,6 @@
 #endif
 #include "stubs.h"
 
-#ifdef __SUNPRO_C
-#pragma weak StoreFontClientFont
-#endif
-
 weak int
 StoreFontClientFont(FontPtr pfont, Font id)
 {
-- 
cgit v1.2.3