Got rid of the G_LOG_DOMAIN junk, per discussion on the mailing list.

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@295 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
rkrolib 2003-11-04 01:30:32 +00:00
parent 30a7dfb0c4
commit cc38ef07e9
19 changed files with 15 additions and 56 deletions

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-callbacks"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-cursor"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-display"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-ext"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-font"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-gamemode"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-geometry"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -3,9 +3,10 @@
* *
* Bitmap and stroke fonts displaying. * Bitmap and stroke fonts displaying.
* *
* Copyright (c) 2003 Stephen J. Baker (whether he wants it or not). All Rights Reserved. * Copyright (c) 2003 Stephen J. Baker (whether he wants it or not).
* Written by John F. Fay <fayjf@sourceforge.net>, who releases the copyright over to the * All Rights Reserved.
* "freeglut" project lead. * Written by John F. Fay <fayjf@sourceforge.net>, who releases the
* copyright over to the "freeglut" project lead.
* Creation date: Mon July 21 2003 * Creation date: Mon July 21 2003
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
@ -27,24 +28,24 @@
*/ */
/* /*
* This file is necessary for the *nix version of "freeglut" because the original GLUT * This file is necessary for the *nix version of "freeglut" because the
* defined its font variables in rather an unusual way. Publicly, in "glut.h", they were * original GLUT defined its font variables in rather an unusual way.
* defined as "void *". Privately, in one of the source code files, they were defined as * Publicly, in "glut.h", they were defined as "void *". Privately,
* pointers to a structure. Most compilers and linkers are satisfied with the "void *" * in one of the source code files, they were defined as pointers to a
* and don't go any farther, but some of them balked. In particular, when compiling with * structure. Most compilers and linkers are satisfied with the "void *"
* "freeglut" and then trying to run using the GLUT ".so" library, some of them would give * and don't go any farther, but some of them balked. In particular,
* an error. So we are having to create this file to define the variables as pointers * when compiling with "freeglut" and then trying to run using the GLUT
* to an unusual structure to match GLUT. * ".so" library, some of them would give an error. So we are having to
* create this file to define the variables as pointers to an unusual
* structure to match GLUT.
*/ */
#include "freeglut_internal.h" #include "freeglut_internal.h"
#if TARGET_HOST_UNIX_X11 #if TARGET_HOST_UNIX_X11
#define G_LOG_DOMAIN "freeglut-glutfont-definitions"
struct freeglutStrokeFont struct freeglutStrokeFont
{ {
const char *name ; const char *name ;
int num_chars ; int num_chars ;
void *ch ; void *ch ;

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-init"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -42,8 +42,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-joystick"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-main"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-menu"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-misc"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"
@ -91,13 +89,7 @@ void FGAPIENTRY glutReportErrors( void )
{ {
GLenum error; GLenum error;
while( ( error = glGetError() ) != GL_NO_ERROR ) while( ( error = glGetError() ) != GL_NO_ERROR )
# undef G_LOG_DOMAIN
# define G_LOG_DOMAIN ((gchar *) 0)
fgWarning( "GL error: %s", gluErrorString( error ) ); fgWarning( "GL error: %s", gluErrorString( error ) );
# undef G_LOG_DOMAIN
# define G_LOG_DOMAIN "freeglut_misc.c"
} }
/* /*

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-overlay"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-state"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-structure"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -76,8 +76,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-teapot"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-videoresize"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"

View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define G_LOG_DOMAIN "freeglut-window"
#include "../include/GL/freeglut.h" #include "../include/GL/freeglut.h"
#include "freeglut_internal.h" #include "freeglut_internal.h"