Changeset 13656

Timestamp:

2007-01-17T11:50:47+13:00 (17 years ago)

Author:

kjdon

Message:

Changed a variable named errcode to rx_errcode, so this compiles with Visual

Location:

trunk

Files:

• gsdl3/src/packages/mg/lib/rx.c (modified) (2 diffs)
• indexers/mg/lib/rx.c (modified) (2 diffs)

trunk/gsdl3/src/packages/mg/lib/rx.c

@@ -7208 +7208 @@
 #ifdef __STDC__
 size_t
-regerror (int errcode, __const__ regex_t *preg,
+regerror (int rx_errcode, __const__ regex_t *preg,
       char *errbuf, size_t errbuf_size)
 #else
 size_t
-regerror (errcode, preg, errbuf, errbuf_size)
-    int errcode;
+regerror (rx_errcode, preg, errbuf, errbuf_size)
+    int rx_errcode;
     __const__ regex_t *preg;
     char *errbuf;
@@ -7220 +7220 @@
 {
   __const__ char *msg
-    = rx_error_msg[errcode] == 0 ? "Success" : rx_error_msg[errcode];
+    = rx_error_msg[rx_errcode] == 0 ? "Success" : rx_error_msg[rx_errcode];
   size_t msg_size = strlen (msg) + 1; /* Includes the 0.  */
 

trunk/indexers/mg/lib/rx.c

@@ -7208 +7208 @@
 #ifdef __STDC__
 size_t
-regerror (int errcode, __const__ regex_t *preg,
+regerror (int rx_errcode, __const__ regex_t *preg,
       char *errbuf, size_t errbuf_size)
 #else
 size_t
-regerror (errcode, preg, errbuf, errbuf_size)
-    int errcode;
+regerror (rx_errcode, preg, errbuf, errbuf_size)
+    int rx_errcode;
     __const__ regex_t *preg;
     char *errbuf;
@@ -7220 +7220 @@
 {
   __const__ char *msg
-    = rx_error_msg[errcode] == 0 ? "Success" : rx_error_msg[errcode];
+    = rx_error_msg[rx_errcode] == 0 ? "Success" : rx_error_msg[rx_errcode];
   size_t msg_size = strlen (msg) + 1; /* Includes the 0.  */