merge XFree86 RC2 (4.3.99.902) from vendor branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE

3 files changed, 19 insertions, 8 deletions

diff --git a/fonttosfnt.c b/fonttosfnt.c
index 375fdb3..ccdb4bb 100644
--- a/fonttosfnt.c
+++ b/fonttosfnt.c
@@ -19,7 +19,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.c,v 1.3 2003/07/08 15:39:49 tsi Exp $ */
+/* $XdotOrg: xc/programs/fonttosfnt/fonttosfnt.c,v 1.4 2003/12/19 02:16:36 dawes Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.c,v 1.4 2003/12/19 02:16:36 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -34,7 +35,7 @@ int crop_flag = 1;
 int bit_aligned_flag = 1;
 
 static void
-usage()
+usage(void)
 {
     fprintf(stderr, "Usage:\n");
     fprintf(stderr, 
diff --git a/read.c b/read.c
index 07d2f2a..6628326 100644
--- a/read.c
+++ b/read.c
@@ -19,13 +19,15 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/fonttosfnt/read.c,v 1.4 2003/11/21 05:22:09 dawes Exp $ */
+/* $XdotOrg: xc/programs/fonttosfnt/read.c,v 1.6 2003/12/19 02:16:36 dawes Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/read.c,v 1.6 2003/12/19 02:16:36 dawes Exp $ */
 
 #include <stdio.h>
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_BDF_H
+#include "X11/Xos.h"
 #include "fonttosfnt.h"
 #include "fontenc.h"
 
@@ -38,7 +40,7 @@ static int ft_inited = 0;
 static FT_Library ft_library;
 
 static int
-FT_Ensure_Inited()
+FT_Ensure_Inited(void)
 {
     int rc;
     if(ft_inited)
diff --git a/util.c b/util.c
index 0808cdf..9b92cad 100644
--- a/util.c
+++ b/util.c
@@ -19,7 +19,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/fonttosfnt/util.c,v 1.8 2003/11/21 05:22:09 dawes Exp $ */
+/* $XdotOrg: xc/programs/fonttosfnt/util.c,v 1.11 2003/12/19 02:16:36 dawes Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/util.c,v 1.11 2003/12/19 02:16:36 dawes Exp $ */
 
 #include <time.h>
 #include <string.h>
@@ -36,8 +37,15 @@ THE SOFTWARE.
 #include FT_FREETYPE_H
 #include FT_INTERNAL_OBJECTS_H
 #include FT_BDF_H
+#include "X11/Xos.h"
 #include "fonttosfnt.h"
 
+#ifdef NEED_SNPRINTF
+#undef SCOPE
+#define SCOPE static
+#include "snprintf.c"
+#endif
+
 #ifdef __GLIBC__
 #define HAVE_TIMEGM
 #define HAVE_TM_GMTOFF
@@ -120,13 +128,13 @@ makeName(char *s)
 
 /* Like mktime(3), but UTC rather than local time */
 #if defined(HAVE_TIMEGM)
-time_t
+static time_t
 mktime_gmt(struct tm *tm)
 {
     return timegm(tm);
 }
 #elif defined(HAVE_TM_GMTOFF)
-time_t
+static time_t
 mktime_gmt(struct tm *tm)
 {
     time_t t;
@@ -142,7 +150,7 @@ mktime_gmt(struct tm *tm)
 }
 #elif defined(HAVE_TZSET)
 /* Taken from the Linux timegm(3) man page */
-time_t
+static time_t
 mktime_gmt(struct tm *tm)
 {
     time_t t;