diff --git a/ChangeLog b/ChangeLog
index 33f789496..8e001b2d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov  2 17:21:29 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* glib.h (G_DIR_SEPARATOR): Add defines for EMX/OS2.
+
 Sun Oct 31 18:55:01 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gcache.c (g_cache_remove): Test if node is NULL.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 33f789496..8e001b2d6 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Tue Nov  2 17:21:29 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* glib.h (G_DIR_SEPARATOR): Add defines for EMX/OS2.
+
 Sun Oct 31 18:55:01 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gcache.c (g_cache_remove): Test if node is NULL.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 33f789496..8e001b2d6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Tue Nov  2 17:21:29 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* glib.h (G_DIR_SEPARATOR): Add defines for EMX/OS2.
+
 Sun Oct 31 18:55:01 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gcache.c (g_cache_remove): Test if node is NULL.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 33f789496..8e001b2d6 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+Tue Nov  2 17:21:29 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* glib.h (G_DIR_SEPARATOR): Add defines for EMX/OS2.
+
 Sun Oct 31 18:55:01 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gcache.c (g_cache_remove): Test if node is NULL.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 33f789496..8e001b2d6 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Tue Nov  2 17:21:29 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* glib.h (G_DIR_SEPARATOR): Add defines for EMX/OS2.
+
 Sun Oct 31 18:55:01 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gcache.c (g_cache_remove): Test if node is NULL.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 33f789496..8e001b2d6 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Tue Nov  2 17:21:29 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* glib.h (G_DIR_SEPARATOR): Add defines for EMX/OS2.
+
 Sun Oct 31 18:55:01 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gcache.c (g_cache_remove): Test if node is NULL.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 33f789496..8e001b2d6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Tue Nov  2 17:21:29 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* glib.h (G_DIR_SEPARATOR): Add defines for EMX/OS2.
+
 Sun Oct 31 18:55:01 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gcache.c (g_cache_remove): Test if node is NULL.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 33f789496..8e001b2d6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Tue Nov  2 17:21:29 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* glib.h (G_DIR_SEPARATOR): Add defines for EMX/OS2.
+
 Sun Oct 31 18:55:01 1999  ape@spacetec.no  (Asbjorn Pettersen)
 
 	* gcache.c (g_cache_remove): Test if node is NULL.
diff --git a/glib.h b/glib.h
index 8618bc56f..9859eb5f7 100644
--- a/glib.h
+++ b/glib.h
@@ -88,6 +88,7 @@
 
 #else  /* !NATIVE_WIN32 */
 
+#ifndef __EMX__
 /* Unix */
 
 #define G_DIR_SEPARATOR '/'
@@ -95,6 +96,16 @@
 #define G_SEARCHPATH_SEPARATOR ':'
 #define G_SEARCHPATH_SEPARATOR_S ":"
 
+#else
+/* EMX/OS2 */
+
+#define G_DIR_SEPARATOR '/'
+#define G_DIR_SEPARATOR_S "/"
+#define G_SEARCHPATH_SEPARATOR ';'
+#define G_SEARCHPATH_SEPARATOR_S ";"
+
+#endif
+
 #endif /* !NATIVE_WIN32 */
 
 #ifdef __cplusplus
diff --git a/glib/glib.h b/glib/glib.h
index 8618bc56f..9859eb5f7 100644
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -88,6 +88,7 @@
 
 #else  /* !NATIVE_WIN32 */
 
+#ifndef __EMX__
 /* Unix */
 
 #define G_DIR_SEPARATOR '/'
@@ -95,6 +96,16 @@
 #define G_SEARCHPATH_SEPARATOR ':'
 #define G_SEARCHPATH_SEPARATOR_S ":"
 
+#else
+/* EMX/OS2 */
+
+#define G_DIR_SEPARATOR '/'
+#define G_DIR_SEPARATOR_S "/"
+#define G_SEARCHPATH_SEPARATOR ';'
+#define G_SEARCHPATH_SEPARATOR_S ";"
+
+#endif
+
 #endif /* !NATIVE_WIN32 */
 
 #ifdef __cplusplus