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

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@295 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/freeglut_callbacks.c b/src/freeglut_callbacks.c
index 3dc8188..978e82b 100644 (file)
--- a/src/freeglut_callbacks.c
+++ b/src/freeglut_callbacks.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-callbacks"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_cursor.c b/src/freeglut_cursor.c
index 44ab5e0..f514652 100644 (file)
--- a/src/freeglut_cursor.c
+++ b/src/freeglut_cursor.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-cursor"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_display.c b/src/freeglut_display.c
index c088c33..3db6cb5 100644 (file)
--- a/src/freeglut_display.c
+++ b/src/freeglut_display.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-display"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_ext.c b/src/freeglut_ext.c
index bb81086..24acc69 100644 (file)
--- a/src/freeglut_ext.c
+++ b/src/freeglut_ext.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-ext"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_font.c b/src/freeglut_font.c
index 447f598..6aa402f 100644 (file)
--- a/src/freeglut_font.c
+++ b/src/freeglut_font.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-font"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_gamemode.c b/src/freeglut_gamemode.c
index abee9c6..a50cdae 100644 (file)
--- a/src/freeglut_gamemode.c
+++ b/src/freeglut_gamemode.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-gamemode"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_geometry.c b/src/freeglut_geometry.c
index 3ef7981..83715bb 100644 (file)
--- a/src/freeglut_geometry.c
+++ b/src/freeglut_geometry.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-geometry"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_glutfont_definitions.c b/src/freeglut_glutfont_definitions.c
index 8154774..a879118 100644 (file)
--- a/src/freeglut_glutfont_definitions.c
+++ b/src/freeglut_glutfont_definitions.c
@@ -3,9 +3,10 @@
  *
  * Bitmap and stroke fonts displaying.
  *
- * Copyright (c) 2003 Stephen J. Baker (whether he wants it or not). All Rights Reserved.
- * Written by John F. Fay <fayjf@sourceforge.net>, who releases the copyright over to the
- * "freeglut" project lead.
+ * Copyright (c) 2003 Stephen J. Baker (whether he wants it or not).
+ * All Rights Reserved.
+ * Written by John F. Fay <fayjf@sourceforge.net>, who releases the
+ * copyright over to the "freeglut" project lead.
  * Creation date: Mon July 21 2003
  *
  * 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
- * defined its font variables in rather an unusual way.  Publicly, in "glut.h", they were
- * defined as "void *".  Privately, in one of the source code files, they were defined as
- * pointers to a structure.  Most compilers and linkers are satisfied with the "void *"
- * and don't go any farther, but some of them balked.  In particular, when compiling with
- * "freeglut" and then trying to run using the 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.
+ * This file is necessary for the *nix version of "freeglut" because the
+ * original GLUT defined its font variables in rather an unusual way.
+ * Publicly, in "glut.h", they were defined as "void *".  Privately,
+ * in one of the source code files, they were defined as pointers to a
+ * structure.  Most compilers and linkers are satisfied with the "void *"
+ * and don't go any farther, but some of them balked.  In particular,
+ * when compiling with "freeglut" and then trying to run using the 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"
 
 #if TARGET_HOST_UNIX_X11
 
-#define  G_LOG_DOMAIN  "freeglut-glutfont-definitions"
-
 struct freeglutStrokeFont
-{ 
+{
   const char *name ; 
   int num_chars ; 
   void *ch ; 

diff --git a/src/freeglut_init.c b/src/freeglut_init.c
index 33b5998..973c7f2 100644 (file)
--- a/src/freeglut_init.c
+++ b/src/freeglut_init.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define G_LOG_DOMAIN "freeglut-init"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c
index 1b2285b..5bb2970 100644 (file)
--- a/src/freeglut_joystick.c
+++ b/src/freeglut_joystick.c
@@ -42,8 +42,6 @@
 #include "config.h"
 #endif
 
-#define G_LOG_DOMAIN "freeglut-joystick"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index c57547c..92f86f5 100644 (file)
--- a/src/freeglut_main.c
+++ b/src/freeglut_main.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-main"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c
index 70f1f14..2f373dc 100644 (file)
--- a/src/freeglut_menu.c
+++ b/src/freeglut_menu.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-menu"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

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

diff --git a/src/freeglut_overlay.c b/src/freeglut_overlay.c
index 14c42c2..2f3a4e6 100644 (file)
--- a/src/freeglut_overlay.c
+++ b/src/freeglut_overlay.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-overlay"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_state.c b/src/freeglut_state.c
index 70d7eaf..4b1aed8 100644 (file)
--- a/src/freeglut_state.c
+++ b/src/freeglut_state.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-state"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_structure.c b/src/freeglut_structure.c
index e61eac7..4a2fa06 100644 (file)
--- a/src/freeglut_structure.c
+++ b/src/freeglut_structure.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-structure"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_teapot.c b/src/freeglut_teapot.c
index 0a3930e..01aab4f 100644 (file)
--- a/src/freeglut_teapot.c
+++ b/src/freeglut_teapot.c
@@ -76,8 +76,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-teapot"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_videoresize.c b/src/freeglut_videoresize.c
index 050dbe1..bdf4935 100644 (file)
--- a/src/freeglut_videoresize.c
+++ b/src/freeglut_videoresize.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-videoresize"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 

diff --git a/src/freeglut_window.c b/src/freeglut_window.c
index cf78fa8..34d3b90 100644 (file)
--- a/src/freeglut_window.c
+++ b/src/freeglut_window.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-window"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"